Updated from openstack-manuals

Change-Id: I3d1b621303aba16bbae7abcfd44f11738b7c728e