Merged r1545480 from tomcat/trunk:
Correct typo in a message

I removed a duplicate changelog entry and split a long sentence.


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

Followup to r1491596
Restore omitted attribute name.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1545497 13f79535-47bb-0310-9956-ffa450edef68
Merged r1545215 from tomcat/trunk:
Fix typos


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