Updated from openstack-manuals

Change-Id: Id180fcd69a48b1d6b0b42435cd2f06003232fd24