Updated from openstack-manuals

Change-Id: I2a707ab9f66804d33380134bb31175be8b6741b3