Updated from openstack-manuals

Change-Id: I18087777f8a3254eb204f6591ae1892a757abe10