Merge "Addressing Technical Debt for ONAP-XACML"