Updated from openstack-manuals

Change-Id: I165f3876a6aad7c768db231964d293d2bde38752