Comment 7 for bug 1306294

Related patch proposed to keystoneclient: https://review.openstack.org/#/c/96298/

I'm still working on the heat part of the fix, but hit a keystone bug which has delayed things a little.