Updated from openstack-manuals

Change-Id: I05d7d941b84451e161f3170cbb222fb775462d82