Updated from openstack-manuals

Change-Id: I820ede0dc292d657fc4c163d9672071b62c89b59