Updated from openstack-manuals

Change-Id: Iae2e37cb2c785c5d579548cc14c2084bb2da24b1