Updated from openstack-manuals

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