Merge "Optimize test_volume_swap_with_multiattach for server status wait"