Updated from openstack-manuals

Change-Id: I0d9b30a7dea05001e08eecb39fc7a63b3786469f