Fix indentation
Merge branch 'dev/chuck/CCBUG2' into maint/3.3/testing
Merge branch 'maint/3.3/testing' of git.eucalyptus-systems.com:eucalyptus into maint/3.3/testing