CTR: No functional change
Re-ordering and whitespace changes to make diffs against 7.0.x easier

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