Updated from openstack-manuals

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