Updated from openstack-manuals

Change-Id: Iaac063c0abb090d1a2582fa641d447101c831920