Updated from openstack-manuals

Change-Id: I8b683a4d8eb1ee7f6553255cf9f920dabcad103e