Merge "Added sonar fixes in StatisticsServlet.java"