Updated from openstack-manuals

Change-Id: I9b47cf62db5f6f9661f040b0346cc65670b44375