Updated from openstack-manuals

Change-Id: I26ca8e796de1e2024c8ede5bcbd2a3da27fe3b26