Updated from openstack-manuals

Change-Id: I4dfe14d5a9c9cd71fc0adaa053d529de50d746c4