Fix replaceAll SONAR issues in apex-pdp