Updated from openstack-manuals

Change-Id: I63ea141650bffb5e1a78ec2cb7df1dfb66ea72cd