CLOUDSTACK-5288 review comments