CLOUDSTACK-6316: Fixed bvt failures