Correct versions.
Merges r1430445 r1430448 from tomcat/trunk

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