#3 Cross domain roles fix#8

dhague wants to merge 4 commits intotwc-openstack:master-keystonetwc-openstack/grafana:master-keystonefrom

stefanhipfel:cross-domain-roles-fixstefanhipfel/grafana_old:cross-domain-roles-fixCopy head branch name to clipboard