Updated from openstack-manuals

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