Updated from openstack-manuals

Change-Id: I9a410ee1abd578c285ec4e616803672faf7c876e