Updated from openstack-manuals

Change-Id: I5a995612bf595dd1fa934f838b70c8371059fcc0