Merge "Fix descriptions for oscore and 2way jobs"