Updated from openstack-manuals

Change-Id: I8e4424466eeb1384f6ac32d5dbe4cc021b934e70