suggested changes.
Merge branch 'setenv-fix' of https://github.com/zshahan/puppetlabs-tomcat.git into setenv-fix