Updated from openstack-manuals

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