CLOUDSTACK-5674: Some fixes to marvin and resultant changes to tests.