BS-11868
Fix tomcat startup