Updated from openstack-manuals

Change-Id: I697b1c6e129ff7ce38dc47df9fe93605a5510a9b