Updated from openstack-manuals

Change-Id: I10b5bad09ea32bee436b3dc9c98e566a89cb1480