Merge pull request #66 from Fraser999/MAID-537

Accommodating changes to NodeId.
Merge remote-tracking branch 'origin/next' into routing_v2