CLOUDSTACK-5674: Fix issues with BVT