Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55052
Fall back to un-prefixed property if a prefixed one is not present

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1489405 13f79535-47bb-0310-9956-ffa450edef68
Some more unused code clean-up.

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