Updated from openstack-manuals

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