Updated from openstack-manuals

Change-Id: I6745d5084e17356628fc6cfb6c6892444a516ecc