Updated from openstack-manuals

Change-Id: I4a689f8e906a3a3a26863f00f741c1dab7c3d849