Merge "Reformat ONAP-XACML test cases"