Merge "Fix test failure in TopologyManagerImplTest#testNotifyNodeConnector"