Updated from openstack-manuals

Change-Id: I8c92dbc3ee48416943a98b5ff842f46462c6e4fd