Prep for next release.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1580968 13f79535-47bb-0310-9956-ffa450edef68
8.0.4 didn't make it

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