Merge "Bug 1686 - Rework TopologyManager to use transaction chaining in order to...