CLOUDSTACK-6250 Review comments fixes for CLOUDSTACK-2692