Updated from openstack-manuals

Change-Id: I1cc3ad7321a48bba4a6f4283abe0a07a24f59ad5