Updated from openstack-manuals

Change-Id: I143673001b57fbbbfbb0f488a9fe8b01d7702ad2