Merge "Continue addressing technical debt for ONAP-XACML"