Tomcat strict variables

I believe this will cover the strict variables failures in tomcat,
although it is dependent on fixes in nanliu-staging and
puppetlabs-concat.