Updated from openstack-manuals

Change-Id: I4371b590fc3df4a7e73daf834401ea9e0f2ac55b