OK, made the 2 fixes you requested and checked the outputs.
I'm glad I decided to try to get this ticket in before w14, because we haven't had colors in our object tables since the filter to band migration (in either Gen2 or Gen3). I opened a new PR for obs_subaru specifying the filters as 'r' rather than 'HSC-R'. This works in both Gen2 and Gen3. Also fixed the NaN reference columns ci_hsc where we only have 'r' and 'i'.
New Jenkins working here: https://ci.lsst.codes/job/stack-os-matrix/33933/display/redirect