change xervmon_agent to xervmon_broker
Merge remote-tracking branch 'origin/xervmon' into xervmon