Updated from openstack-manuals

Change-Id: Ia51503753d32610af652bf40aa45970e281afaf6