Parameterise Tomcat version in config.pp.
Remove default-jdk from solr::install.
Update solr::params to use parameterised tomcat version.