Updated from openstack-manuals

Change-Id: I9900fa61dbfce6db1bddf3e675a9a9c5ca011fa5