Merge "Fix PublishServlet Vulnerabilities"