tomcat init rc script fix
Merge branch 'master' into composite