Updated from openstack-manuals

Change-Id: Iad223ffb20b504d5160a1f51b46b74ef7c8258e1