Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46381 Needs testign with the TCK before proposing for 6.0.x
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46381
Needs testign with the TCK before proposing for 6.0.x

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@729569 13f79535-47bb-0310-9956-ffa450edef68

apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat,Nickname0806/Test_Q4,Nickname0806/Test_Q4,apache/tomcat,Nickname0806/Test_Q4,Nickname0806/Test_Q4