Merge "Attempt to clean up any servers we left behind after a test"