Merge "Upgrading XACML jar"