(OFBIZ-6993) # Conflict handled by hand in: # framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
(OFBIZ-6993) # Conflict handled by hand in: # framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java