Rename since I need to create some unit tests that don't use Tomcat embedded

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