Updated from openstack-manuals

Change-Id: I2d9c60087964135cfadf2f0fa12ae3cd0836ac44