Updated from openstack-manuals

Change-Id: I586b199e519dd08fd51ed8b4ab540cdf1ad40109