Updated from openstack-manuals

Change-Id: I103c16c933274783ef2fa39135c08f9bccaf7710