Added swap()for NodeId.
Merge remote-tracking branch 'origin/next' into boost_update