Merge "fix sever not deleted issue in test_attach_detach_volume."