Reaction calculation 4190

resolve the merge conflict...
Ref #4190 
@leizhao987  Have you changed the computeqpelasticitytensor to its old form. I don't see it.