It is merge of revisions r1187805, r1187827 from tomcat/trunk,
but with exception of res/checkstyle/checkstyle.xml changes from r1187805

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