Updated from openstack-manuals

Change-Id: Id98149a5d0aa9b112af0a03eaa73b761cb1355ea