[Merge] lp:~xianghui/ubuntu/trusty/oslo.messaging/icehouse-lp1521958 into lp:ubuntu/trusty-proposed/oslo.messaging

[Michael Terry]

Review: Needs Fixing

This no longer applies cleanly (1.3.0-0ubuntu1.4 was released in meantime).
-- 
https://code.launchpad.net/~xianghui/ubuntu/trusty/oslo.messaging/icehouse-lp1521958/+merge/281443
Your team Ubuntu branches is subscribed to branch lp:ubuntu/trusty-proposed/oslo.messaging.