Given that the upstream fix for kilo [1] has been abandoned, I'm closing this was WONTFIX. [1] https://review.openstack.org/#/c/289302/