Fix backport from Tomcat 8. Servlet 3.1 / Java 7 issues.

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