Merge "Fix sonar issues xacml pdp"