Accommodating changes to NodeId.
Merge pull request #31 from Fraser999/MAID-537

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