New file for keeping track of svn merges etc

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

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