for 2.1
Merge branch 'dev' of github.com:yujinqiu/ServiceTree into dev

* 'dev' of github.com:yujinqiu/ServiceTree:
  for 2.1
add machine query interface