CLOUDSTACK-804 review comemnts