Updated from openstack-manuals

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