Updated from openstack-manuals

Change-Id: Iace5d79d637b0759980b33e19c4bf34831cd582b