Changes reflecting changes in the Folsom API of keystone

Mostly minor changes:
* '-' to '_' in tenant_id etc.