NOREF: Removing whitespace so puppet-lint is happy from apache and a complete rewrite of tomcat since I am abandoning the pftomcat module