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

Conflicts:
	src/maidsafe/rudp/connection_manager.cc