Updated from openstack-manuals

Change-Id: Id66776d10ea0f0bcbf5a72ef8ec1c8c3d3a9d5f4