Updated from openstack-manuals

Change-Id: I42ff26ac9cca2780aada5d2c282a9b85471aa6e7