Merge "scenario: Use wait_for_volume_attachment_remove_from_server in nova_volume_detach"