LPS-46802 - Consolidate 'build-test-tomcat-*.xml'