Merged revision(s) 1631347 from tomcat/trunk:
Fix Java8 Javadoc warnings for javax.websocket package

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1632955 13f79535-47bb-0310-9956-ffa450edef68
Merged r1631568 from tomcat/trunk:
Fix some Javadoc warnings when compiling with Java 8

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