Consolidate xacml dependencies