CLOUDSTACK-5764: Some fixes to marvin