Use consistent naming for embedded web-socket JAR

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1560993 13f79535-47bb-0310-9956-ffa450edef68
There is an additional CDDL licensed file in servlet-api.jar as a result of copying the jsp-api schemas

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