* Adjust for AADLv2.1 syntax
        * Adjust for packaging
Merge branch 'private'