Comment 8 for bug 1377080

Alexander, I really want to apologize for marking this invalid and then essentially merging the same thing later with a new bug.

We got some pressure coming down from the infra teams to get this fixed in keystoneclient and when i went looking for this bug i couldn't find it (my mistake i though 'catalog' was mentioned somewhere).

What was merged is almost exactly the same thing you proposed.

I'm marking this a duplicate of the new bug (when it should be the other way around) as the new bug has the merged patch attached.

Again, sorry about this.