Updated from openstack-manuals

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