Updated from openstack-manuals

Change-Id: Ic6266e4e901d008f9f4d3bb350750f0d1f376545