CLOUDSTACK-5674: Added few changes for CLOUDSTACK-567