Updated from openstack-manuals

Change-Id: I53d03ea8e7331c00231941ddd3d81c0d086030ff