Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54536
If a custom error status is used and a message is provided, display that message via the default error page.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1445328 13f79535-47bb-0310-9956-ffa450edef68
Increase time allowed for test in an effort to reduce false test failures.

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