Updated from openstack-manuals

Change-Id: I4f798c8d5f1f91e9bd8c6e2a6349213852f95537