Updated from openstack-manuals

Change-Id: I278e95b2ea359278693b4d9e4da9e9ffe1872e89