Send message_id as property

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

Change-Id: I2eaa705673408b4cdacf8571072312ddbf8efd69
Closes-Bug: #1322078