Follow up to r1634089.
Fix some additional test failures with the stricter escaping rules.

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