Updated from openstack-manuals

Change-Id: I88d0a614396a011ca5505a68600b980fecd35204