Removed IsZero() from NodeId again.
Merge remote-tracking branch 'upstream/next' into MAID-537
Merge branch 'MAID-537' into routing_v2