Updated from openstack-manuals

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