Merge "[SO] update the clm jobs for the jakarta release"