Updated from openstack-manuals

Change-Id: I44e1f4157023bd339336900125a151b2767752e5