Updated from openstack-manuals

Change-Id: Iffc425d63b9b1ce86f4d0ad7dd68542d7b7b8bf3