Updated from openstack-manuals

Change-Id: I4cc99cd7f00bdd8bb2bceac2ff6648558323e181