Merge pull request #2 from arpitgupta/master

HW QE Changes: 
[~samarthg] merging the changes. ran a instance management suite, that works fine. Will need to run more complex test involving multiple cluster to check something else not broken.
fix compilation error due to array to arraylist