Updated from openstack-manuals

Change-Id: I0386a4cca9eba91146ac3ac3b0533096884f7388