CLOUDSTACK-6316: Fixed bvt failures because of test data and wrong references
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>