As discussed in Software Coordination, these MRs should be reviewed in an expedited way.
@jcatmore @krumnack
This updates CalibrationDataInterface in master to be on par w/ 21.2.
@cpollard @dguest