GEOT-4936 added support for instance instead of port

This want meant to be left commented out. Maybe we should add a system variable to control it?