ARQ-1496 Initial support for Tomcat 8 embedded container