CLOUDSTACK-6316: fixes for bvt failures