java test
Merge github.com:cs553-cloud-computing/amazon-cloudstack