Updated from openstack-manuals

Change-Id: I71bba04d5f74f3d2e0de65846d3a815a17bff19f