Updated from openstack-manuals

Change-Id: I2225e1888ecca93f5fe67d4b2615ac3638ebdcb7