Updated from openstack-manuals

Change-Id: I45b1dabfc9e1947e47ef3b49afac37d05a03a8e6