Updated from openstack-manuals

Change-Id: Ibc91be481945041bd96e220528aefb55b4d840d0