Updated from openstack-manuals

Change-Id: I123fefff9b68d31e565045d3d28e9451a3b90f58