Updated from openstack-manuals

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