Updated from openstack-manuals

Change-Id: Ia089c9aeddb8ea3aef1dd36c4f57995ea6806482