Rebase 6 changes from openstack/master

Changelog:
- Rebase 6 changes from openstack/master
- Add filters to the collections 'self' link
- Use config fixture from oslo.config
- KeyError instead of exception.KeyError
- Do not consume trust uses when create token fails
- Refactor set domain-id and mapping code
- Remove duplicated asserts