Bunch of tomcat changes that add defaults where they should be, and makes sure the service is stopped when building an AMI