CTR. No functional change.
Make it easier to diff against 7.0.x.
Comment fixes. Whitespace alignment.

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