Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55663
Minor correction to the wording of the NOTICE files to align them with http://www.apache.org/legal/src-headers.html#notice (violetagg)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1539575 13f79535-47bb-0310-9956-ffa450edef68
Remove applied patch

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