Merge branch 'nifty6_more_scaling_ops' into 'NIFTy_6'

No DiagonalOperator if ScalingOperator is fine

See merge request !407
10 jobs for NIFTy_6 in 16 minutes (queued for 2 seconds)