Updated from openstack-manuals

Change-Id: Ib1ed792e999369a00610dccc3041468a8dd7187b