Updated from openstack-manuals

Change-Id: I97beba9cd10cca2db929c2fc7a4a95dbf2f2f221