Merge "Do not create volume in resource_setup for test_volume_reset_status"