Updated from openstack-manuals

Change-Id: Ica58b438fbceaec2d3badee17905b91898c41926