Comment 8 for bug 1577804

Steve suggested this could also be backported to Liberty. Unfortunately, backporting to Liberty is not clean. It hits a merge conflict due to changes from the fix for https://bugs.launchpad.net/keystone/+bug/1501698 (more specifically, https://github.com/openstack/keystone/commit/9c6c24f35717bd0a9271c975f75e0dc3419b7203), which from the look of them may at least in part also be necessary to fix this for Liberty. I'll leave that for someone else if they want to take it on.