Fix for CLOUDSTACK-2304
Addressed comments in review board submission 12025