added configurable parameters maxAssocCaloE and maxAssocCaloEDeltaRSize
added configurable parameters maxAssocCaloE and maxAssocCaloEDeltaRSize
Merge pull request #6215 from jbrinson/721branch

added configurable parameters maxAssocCaloE and maxAssocCaloEDeltaRSize