Merge "[SO] update the clm jobs for all the SO kohn branches"