Comment 18 for bug 1227027

Patch shall be backported once it hits the master branch.

@Xavier: feel free to propose backports yourself
See https://wiki.openstack.org/wiki/StableBranch#Proposing_Fixes