Updated from openstack-manuals

Change-Id: Ied4c93d8be3cbb5c47749a9ae262158d9d1ba1de