Updated from openstack-manuals

Change-Id: I699441ab33ff65e126c502fc82b56ad168b2d029