linux命令执行结果解析测试
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	collector/vrouter.ini
	config/agent.client.json
做了VMenu测试
Merge branch 'master' of https://github.com/luomuwen/mapagent