Changed delete server to use wait_for_server_to_be_deleted

Change-Id: I32a83ef0ad78aa9d847546df2566b58bebe9b735