Updated from openstack-manuals

Change-Id: I81c0d2d2571adfb821369fa21285cb679ac452b9