Same basic changes as were made for adi-development. Missing in this MR are some commits I inadvertently pushed to master while replacing references to the com.github.nblair packages with their local (and newer) gitlab-ci versions. Those are here: 9f7957dc
I will need to do the master => main rename after this MR as well.
@road