Updated from openstack-manuals

Change-Id: I12dc84c1fdb26ee2249d81c741c515d5526422ef