Updated from openstack-manuals

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