Merge "Update docker script for tomcat install"