Updated from openstack-manuals

Change-Id: I93ab13bd8583b474a026d7e2758da4217382d19d