Updated from openstack-manuals

Change-Id: I95f8cb70a5152edb4518876804f32eb966c5545d