Updated from openstack-manuals

Change-Id: I6ed83613b2f26b3ac4e428fdbf708c7456275738