CLOUDSTACK-3236