Updated from openstack-manuals

Change-Id: Ib10bc7b21ddd3b95669d1d2c8c8496343015fae4