Updated from openstack-manuals

Change-Id: Ifb448f0792f5cf12dfc88fdbcd1e0ab4c011b5a9