Clean-up

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1489195 13f79535-47bb-0310-9956-ffa450edef68
Clean-up (prior to merging in changes for CORS patch)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1489196 13f79535-47bb-0310-9956-ffa450edef68
Clean-up (prior to merging in changes for CORS patch)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1489201 13f79535-47bb-0310-9956-ffa450edef68