sync to oslo commit 1cf2c6

Syncs with oslo incubator commit:
  1cf2c61673be2fc077fa3445bcd4bc21fd0c298b

First, remove the existing code to cleanup:
 $ rm -r keystone/openstack/*

Then, sync from oslo-incubator:
 $ python update.py ../keystone

Note: had to undo the deletes to config/*, README,
importutils.py and gettextutils.py, since they are
still being used

Change-Id: I4c84513a5b94c08d7733de20a2b54ca0afbf5b23
Merge "sync to oslo commit 1cf2c6"