Add instance id suffix to Tomcat Engine name

Fixes gh-161