Merge "Add cleanup for test_show_auto_allocated_topology test"