Cleanup Tomcat Buildpack Support

This change cleans up some code to be better tested and meet Sonar
requirements.

[#64674470]
Merge 64674470-tomcat-logs to master

[#64674470]