include tomcat8 in build-images, fix tomcat7/8 run cmd