Moving InstanceInfo related classes to a new package
Fix integTest shutdown
Merge pull request #314 from qiangdavidliu/2.x

2.x refactoring