Fix message envelope keys.

update.py from oslo-incubator broke the keys used in the rpc message
envelope.  This fixes it.

Change-Id: Idabd18720cad8c4469c5dc3ec1ffd20a3a39e897
Merge "Fix message envelope keys."
Merge remote-tracking branch 'm_src_repo/master' into build-temp