Make ec2-credentials-* commands work properly for non-admin user
Make ec2-credentials-* commands work properly for non-admin user

* Add user id to token-get output
* Save authenticated user and tenant IDs in client in Client._extract_service_catalog()
* Handle default user and tenant IDs in ec2-credentials-* commands

Fixed bug 947011

Change-Id: I97750f666ba03f32f0bb1be0c2df5ad8a321b433

sileht/keystoneauth,jamielennox/keystoneauth,citrix-openstack-build/keystoneauth