Updated from openstack-manuals

Change-Id: Icf8ea85a983ccbaf4a81086b691c298eb1fa638c