Updated from openstack-manuals

Change-Id: I95b448265ac71560e716b2a42630ac82b5919e0b