Merge "Fix sonars in xacml-pdp"