Updated from openstack-manuals

Change-Id: I8903b0d7749b627956bcb5d47954e89e3993d39b