Updated from openstack-manuals

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