Updated from openstack-manuals

Change-Id: I02bf6553149a06cfaffc808aa4056f9d198a6f53