Updated from openstack-manuals

Change-Id: Iba75dd6d8a64a4035407dc6c393d12a838da90bd