Updating logic for determining tomcat version

Allows for specifying either tomcat or tomee version, tomee version
always overrides the tomcat version.