Updated from openstack-manuals

Change-Id: I7faeb884f34cc0401cbe658bccbdf4e7ed380bda