Updated openstack/openstack
Project: openstack/keystone  8bd7726326068c9ab630a675029f875af9fb5694
null
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
Updated openstack/openstack
Project: openstack/python-novaclient  297ebde1d38d203699547e41e00384fdad1bb798
null
Explain how to delete a metadata in aggregate-set-metadata

nova aggregate-set-metadata not given value of a key means delete the
metadata, so explain this usage in help message.

Change-Id: Ie8215bd8b47ed00e3d4686edab9e3052ae84774d