Updated from openstack-manuals

Change-Id: I9a147a428c1fe4fab96ff8575a929915eb81b899