Updated from openstack-manuals

Change-Id: I8f8e32bcb33141c8ed195eeb1f0dc1e05b794a62