Clean up XACML policies

Cherry-pick the commits to cleanup xacml policies, disable failing triple finder unit tests