fix interpretation of rules D.4.(L1) and D.4.(L2); and use aadlba formatter
Merge branch 'develop' of https://github.com/osate/osate2-ba into develop