Updated from openstack-manuals

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