Updated from openstack-manuals

Change-Id: Ie40ae6c08af7f4310c156d5adc70e2b8287d0045