Updated from openstack-manuals

Change-Id: I783e35766c48df896c37a2d49f78cb701d76a45f