Send message_id as property

message_id field should be sent as message property, not as
field in message headers

Change-Id: Ibe0fc32136c719e62eb2ce8557f3063c8aa387fd
Closes-Bug: #1322078