Updated from openstack-manuals

Change-Id: I8677c0139b3d95c5247400c02a312d6146829835