Updated from openstack-manuals

Change-Id: Iae06a42f3f25b7ec655b5d4683cbd8d3d725276a