Updated from openstack-manuals

Change-Id: I12ed00a6cc12c0eb668a9137eda2d82404adcdc1