Updated from openstack-manuals

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