修改采集shell修改，规范代码
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	config/agent.client.json