GWDP-771 tomcat periodically ran out of memory or threads because Executors where not shutdown, this is the first attempt to properly shut them down
warnings cleanup with some unintensional whitespace IDE induced changes