Updated from openstack-manuals

Change-Id: Idc9d1e8bf4495a4a7cfb965952c31673ce3ce5ab