Fix regression in fix for BZ55996

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1562581 13f79535-47bb-0310-9956-ffa450edef68
8.0.0 will not be released

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1562584 13f79535-47bb-0310-9956-ffa450edef68
Prep for next release

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