Fixed Regression issues mentioned in following test failures

integration.smoke.test_iso - CLOUDSTACK-6774, CLOUDSTACK-6769
integration.smoke.test_non_contigiousvlan - CLOUDSTACK-6776
integration.smoke.test_primary_storage - CLOUDSTACK-6770
integration.smoke.test_secondary_storage â€“ CLOUDSTACK-6777, CLOUDSTACK-6773
integration.smoke.test_scale_vm - CLOUDSTACK-6768

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>