Updated from openstack-manuals

Change-Id: Ie73f6e4516830458e66096e46f6d2a5635800725