Modify Policy manager servlet for sonar issues