Updated from openstack-manuals

Change-Id: Ib99b117f0d85b36a0e40033587db768cb43b65ef