Merge "Prepare the TopologyManager code for integration testing. Need to have the...