Updated from openstack-manuals

Change-Id: I428bbdd106b41a06c30470d3db6bfaeb617a631f