Updated from openstack-manuals

Change-Id: I01786927380bdebec348e5d38fe5be1af97d26ce