Updated from openstack-manuals

Change-Id: I39c459d22f40b0cdbe2ace80f906d41e5b517978