fixup require parameter
merge local changes
Merge branch 'master' of github.com:meltwater/tomcat7_rhel