CTR: No functional change. Align 6.0.x closer to 7.0.x to make diffs
clearer
Whitespace changes
Variable rename
Remove unused variable

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