Updated from openstack-manuals

Change-Id: Iafc4ead31b992ac4b667a63a2dd52f6ddacb6618