Updated from openstack-manuals

Change-Id: I447bddf98c54930db281d90ef637617492d9b5a2