Updated from openstack-manuals

Change-Id: I3ad51f4ea909ca976e4bf56a63bc07d3a08527c5