Updated from openstack-manuals

Change-Id: Iabe2f7deca2aff200c548abe19d55c41ba67eba9