Updated from openstack-manuals

Change-Id: If21b774a0da4d64891fe934f609007520dcb0262