Updated from openstack-manuals

Change-Id: Iaf6a065f7a174662a0b4380d0b29e29a2ab5cca2