Updated from openstack-manuals

Change-Id: I125c706b921ddd58bb13bf5563996872a17b3e2a