Add support for uid and corid on messages related to pairing.

[bjhandeland]

Currently, if you send a message with uid, you don't receive a corid back when doing things like inclusion / exclusion.