improve #2061 and fix java and tomcat process containers