FC-2737 - updated to fix a few issues with regards to detecting the engine and using instancename (no longer relevant in tomcat/CF0)