Merge "Use addCleanup in test_rebuild_server"