Revert java7 Diamond inference language feature. and testng.xml refined
Merge branch 'testing' of git.qa1.eucalyptus-systems.com:qa-repos/eutester into testing
Merge branch 'testing' of git.qa1.eucalyptus-systems.com:qa-repos/eutester into testing
Merge branch 'testing' of github.com:eucalyptus/eutester into testing
Fix logic for finding phantom instance
Fix modify property