Updated from openstack-manuals

Change-Id: I174ffe40f9f583875d820ae6e4b79ba9b81a4c69