Updated from openstack-manuals

Change-Id: I4566db4a09984199aa1c6c5387b78732799da558
Merge "Updated from openstack-manuals"