CLOUDSTACK-4945
CLOUDSTACK-5604 review comments incorporated