Merge pull request #121 from KurtStam/master

request for merge bz 1034290 and 1034290
various updates including those required due to overlord-commons refactorings
Added initial tomcat 7 support (not quite working yet).
Merge pull request #122 from EricWittmann/tomcat7-support

Tomcat7 support
Merged patch from gvarsami for BZ 1033196
Merge pull request #123 from EricWittmann/BZ-1033196-patch

Merged patch from gvarsami for BZ 1033196
fix for https://bugzilla.redhat.com/show_bug.cgi?id=1026293, removing trailing slash