Updated from openstack-manuals

Change-Id: I47e4ff9cd9701acba0c861c7abbd2503d6bcfec4