Merge "Add Naming policy test for xacml CSIT"