Updated from openstack-manuals

Change-Id: I0f51e2e559260377198f29d27048b1552e97d5f8