Merge branch 'revert-49041a7f' into 'master'

NonLinearSolver/internalPoints/CMakeLists.txt

.../internalPoints/ipNonLocalDamageGursonThermoMechanics.cpp

...er/internalPoints/ipNonLocalDamageGursonThermoMechanics.h

NonLinearSolver/internalPoints/ipNonLocalPorosity.cpp

NonLinearSolver/internalPoints/ipNonLocalPorosity.h

NonLinearSolver/internalPoints/ipPhenomenologicalSMP.cpp

NonLinearSolver/internalPoints/ipPhenomenologicalSMP.h

NonLinearSolver/materialLaw/CMakeLists.txt

NonLinearSolver/materialLaw/CoalescenceLaw.cpp

NonLinearSolver/materialLaw/CoalescenceLaw.h

NonLinearSolver/materialLaw/j2IsotropicHardening.cpp

NonLinearSolver/materialLaw/j2IsotropicHardening.h

NonLinearSolver/materialLaw/mlaw.h

NonLinearSolver/materialLaw/mlawNonLocalDamageGurson.cpp

NonLinearSolver/materialLaw/mlawNonLocalDamageGurson.h

...w/mlawNonLocalDamageGursonFullyCoupledThermoMechanics.cpp

...Law/mlawNonLocalDamageGursonFullyCoupledThermoMechanics.h

NonLinearSolver/materialLaw/mlawNonLocalPorous.cpp

NonLinearSolver/materialLaw/mlawNonLocalPorous.h

...inearSolver/materialLaw/mlawNonLocalPorousCoalescence.cpp