Initial work on supporting cloudstack
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
to support deploying to Apache CloudStack