Merge "Use base.delete_server in base.rebuild_server"