Merge branch 'cfm_changes' into 'NIFTy_6'

Small changes in CorrelatedFieldMaker

See merge request !384
9 jobs for NIFTy_6 in 8 minutes and 52 seconds (queued for 2 seconds)