Fix xacml-pdp due to sonar changes in common