Updated from openstack-manuals

Change-Id: I91937e516a19da75972c7b27b54b8463a7350599