Updated from openstack-manuals

Change-Id: I0e9d6417540df590eb73600e8d18dc1d731d8da3