Backport messaging patch

https://github.com/noelbk/oslo.messaging
960fc26ff050ca3073ad90eccbef1ca95712e82e

Change-Id: If74519fff4c488c0a83441e42080758abb6a0f30
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>