Updated from openstack-manuals

Change-Id: Id0b0a955211487a001ec6a8b1716c4403ef84162