Updated from openstack-manuals

Change-Id: I1e99eda217137a01d88ab59a541619fb4fd7e2fe