Merged r1631717 from tomcat/trunk:
Fix the remaining Javadoc warnings for the EL API when building  with Java 8.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1632958 13f79535-47bb-0310-9956-ffa450edef68
Merged r1631987 r1631993 from tomcat/trunk:
Java 8 isn't complaining about these but Eclipse is so fix them as well

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