Updated from openstack-manuals

Change-Id: I8c2834435169509c25e62f70ea992278ea9135af