USERGRID-2400: added more support for debugging and troubleshooting