Updated from openstack-manuals

Change-Id: If0edd4953271224722ca97801ce158c1a84c035e