Merge branch 'noflexibilityorasperity' into 'NIFTy_7'

No flexibility or asperity for simple correlated field maker

See merge request !555
12 jobs for NIFTy_7 in 26 minutes and 4 seconds (queued for 2 seconds)