Updated from openstack-manuals

Change-Id: Ia25ab643dff17abe7cb9a5ad362c12c64399e39a