Follow-up to r1456068. Update mergeinfo

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1456198 13f79535-47bb-0310-9956-ffa450edef68
Follow-up to r1456080. Update mergeinfo

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