Updated from openstack-manuals

Change-Id: Idc0be8990fcd16d09617a53054466ee1388d32bb