Updated from openstack-manuals

Change-Id: I491584713339b0c15d6505c84a5eb1e5d19cd1c1