Merge "Updating XACML dependencies to latest version"