Updated from openstack-manuals

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