Updated from openstack-manuals

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