Comment 3 for bug 1505166

LP missed this:

Fix proposed to branch: master
Review: https://review.openstack.org/232661

Further, this problem is being seen with operators running kilo so marking for liberty/kilo backport potential