EUCA-5430
Merge branch 'testing' of https://github.com/eucalyptus/eutester.git into testing