Merge "Fixing wrong cleanup order in test "test_rebuild_server""