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

Accommodating changes to NodeId.