Updated from openstack-manuals

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