Updated from openstack-manuals

Change-Id: Ia459409098eab5a4ec25d2a9d5a0e51fd13c8d12