Updated from openstack-manuals

Change-Id: I82ed9c7b9e3234b943a4e069c4b480a9c501eee9