Please review the attached patch which addresses the following TRAC ticket:

In the review, although the changes to base/server/share/conf/server.xml would still be necessary, please provide feedback on whether or not the following server.xml files should simply be deleted from the source tree rather than incorporating this change:

Note that development of this ticket yielded the following two new TRAC tickets: