Updated from openstack-manuals

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