Merge "Bug 1348 - TopologyCommitHandler NullPointerException on edgeUpdate CHANGED"