Merge branch 'testing' of git.qa1.eucalyptus-systems.com:qa-repos/eutester
Fix up cloudwatch test.

Change-Id: I6cdcb29a18d51e3190d69480e7c0f2c8d2b8fec3
Add retry around writing to disk on volume attach.

Change-Id: Id8c2ce29ab5fb3b0277b60556f9cac3c1bd71ca8
Remove errant commits for cleanup

Change-Id: Iaf25b1c00f0234afc15f74280d09300b5915f506
Fix merge conflict

Change-Id: If9d79150d439d0759eab4a5397b7abb0c6a38981