Rebase 6 changes from openstack/master

Changelog:
- Rebase 6 changes from openstack/master
- Update the config file
- Catch correct oslo.db exception
- Add pluggable range functions for token flush
- Fix invalid self link in get access token
- Details the proper way to call a callable
- Check that region ID is not an empty string