Merge branch 'constantfixups' into 'NIFTy_7'

Fixups regarding constant minimization, nanisinf for EnergyAdapter

See merge request !523
12 jobs for NIFTy_7 in 13 minutes and 45 seconds (queued for 2 seconds)