Updated from openstack-manuals

Change-Id: If5d74b77c56159f67208446b19c790120b5716ff