Accommodate changed NodeId functions.
Merge branch 'routing_v2' of github.com:Fraser999/MaidSafe-RUDP into routing_v2