Description of problem: Request to backport change to configure Keystone to use Mellon according to [1] [1] http://docs.openstack.org/developer/keystone/federation/mellon.html Need to backport: https://review.openstack.org/#/c/256642/