Tomcat Intermediate State
JNDI Connection
Merge branch 'tomcat' into develop