Updated from openstack-manuals

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