Remove inheritance from recently-removed ScaledFlux class
Register CModel flux fields with new aperture correction system
Add config files to enable/disable CModel in calibrate.measurement
Adapt to change in aperture correction registry interface change
Merge branch 'u/jbosch/DM-191'
More complete check in CModel for whether a Calib is present
Merge branch 'u/jbosch/DM-189'