Updated from openstack-manuals

Change-Id: I432bf8d181df8af9b97e14eba1336cac94ee85ec