[HELIX-319] refactor MonitoringClient to accommodate distributed monitoring server, minor fix