refs #6485 Additional changes to GetEi and HFIRLoad.