Updated from openstack-manuals

Change-Id: I4fa12b00a77f33f13083d55fe5717be15183af8c