Merge "Use base.delete_server in addCleanup"