Cloudstack

merge cloudstack branch back to master