Updated from openstack-manuals

Change-Id: I87ab93220d7d97ab0bc3ee41a5f5468fad0d8fe9