Updated from openstack-manuals

Change-Id: I862d1a9b3c9acc57393df81633cde53b01325018