Updated from openstack-manuals

Change-Id: I004dd4dda13f7b3d8f1b05dca1e9b935df90ffbc