CLOUDSTACK-3546 edits and additions