Updated from openstack-manuals

Change-Id: I50d84e363eb49265dfbeb552414dab67d42c1793