Updated from openstack-manuals

Change-Id: I1c2e59038f3be89fd5e59926a6d9782924304719