Updated from openstack-manuals

Change-Id: I7eabba286305f8dae807d13bf3661cd89ac248d6