Updated from openstack-manuals

Change-Id: I19dcd188f4a0f0e9d07dd47320904a07660eaadb