Merge "Fix console warning about xacml.properties"