Updated from openstack-manuals

Change-Id: I707f716a32ce7de05fd4a94f029d1a5f0a0d19ab