CLOUDSTACK-906 review comments fixed