Merge "Bump xacml-pdp master to 2.4.0-SNAPSHOT"