Attaching patch which also addresses the remainder of https://bugs.launchpad.net/keystone/+bug/1872735
Attaching patch which also addresses the remainder of https:/ /bugs.launchpad .net/keystone/ +bug/1872735