Comment 1 for bug 1800226

I've push what I think is an appropriate fix to:

  cs:~james-page/openstack-dashboard-5

Its not exactly inline with your suggestions but it is aligned to equivs in keystone (excluding our service project hack for service accounts).