Make service catalog include service name

If a service name is available then it should be included as part of a
token's service catalog. This functionality was present in the V2 api
and is already relied upon by various clients. It will make it much
easier to transition these clients if we can keep this functionality.

Change-Id: I0d824d73c375ffbc5a6b44c10992967f59742b01
Closes-Bug: #1288098
support conventional domain name with one or more dot

Formal domain name will have one or more dot within the name,
meantime, it's common for one company own several domains,
for example abc.com and abc.net. But currently keystone
multi-domain support only supports domain name without '.',
because the wrong way that get the domain name from domain
config file name.

Change-Id: I152cd3b513353e3d4c565e71c8755789d24e1a0e
Closes-Bug: 1257171
Fix create_region_with_id raise 500 Error bug

1. add sql.handle_conflicts wrapper in sql backend driver.
2. check duplicate region id in kvs backend driver.
3. add 2 test cases to check exception.Conflict when create duplicate id region.

Closes-Bug: #1283904

Change-Id: Icfc5edf661501a5c134f324a76824812dbda2760
Merge "support conventional domain name with one or more dot"
Merge "Fix create_region_with_id raise 500 Error bug"
Merge "Make service catalog include service name"