refs #10332 Allow incident energy to be defined as eFixed log name
Merge branch 'bugfix/10332_updateEi' into develop