Consistent handling of multiple keys in Message

Message objects may be constructed with a list of keys as a
simple fallback mechanism. This patch assures consistent
handling of this case.

Change-Id: I458c0af3114754ddf3d721f6c374e249f482e4cf
Merge "Consistent handling of multiple keys in Message"