Merge "Fixed Blocker Sonar issues in ProxyServlet.java"