Keystone doesn't depend on bcrypt any more

see https://github.com/openstack/keystone/commit/48f2f650c8b622b55e67610081336055ec9a2c8e#keystone/common/utils.py

Change-Id: I3038a96deb9ca319224c07f549c893d24707be0d
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp