Updated from openstack-manuals

Change-Id: I5039a47fc143890f172fbb6dce56f4d387bdab39