Updated from openstack-manuals

Change-Id: I04cf1f4634d4999d94532bffd47c6b30e6b5b4c2