Merge "Fix test_shelve_volume_backed_instance"