Updated from openstack-manuals

Change-Id: I14a07957ba2738b359f582e5edda9488141d859d