Merge "Bug 2158: Fixed TopologyManager for edge updates."