Updated from openstack-manuals

Change-Id: Iaa3ce4e4e6a2209963cf88501cd69e51b4fa3cf8