Fix a couple of TODOs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1449678 13f79535-47bb-0310-9956-ffa450edef68
Rename prior to some refactoring

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1449680 13f79535-47bb-0310-9956-ffa450edef68
Pull up duplicate code to new abstract base class

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