Allows the JDK to be chosen in services.tomcat
Merge pull request #3425 from luke-clifton/lc-tomcat-jdk

Allows the JDK to be chosen in services.tomcat