Merge "Sonar fix - ApprovalSet.java - Remove this unused import 'org.onap.aaf.cadi...