Updated from openstack-manuals

Change-Id: I1bdecbc4180d819b2344e2e0a22addf264ef8e88