Accommodating changes to NodeId.
Merge remote-tracking branch 'upstream/next' into MAID-537
Merge pull request #50 from Fraser999/MAID-537

Accommodating changes to NodeId.