Merge "Fix LogServlet Vulnerabilities"