GIT: resolved merge conflict

applications/solvers/DNS/dnsFoam/dnsFoam.C

applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H

applications/solvers/combustion/PDRFoam/PDRFoam.C

applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C

.../PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C

.../PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H

...RFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C

...ers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C

applications/solvers/combustion/chemFoam/createControls.H

applications/solvers/combustion/chemFoam/readControls.H

...pressible/rhoSimpleFoam/rhoPorousSimpleFoam/createZones.H

...ressible/shallowWaterFoam/readGravitationalAcceleration.H

...pressible/simpleFoam/porousSimpleFoam/createPorousZones.H

...malPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C

...malPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H

...vers/stressAnalysis/solidDisplacementFoam/createControl.H

...ers/stressAnalysis/solidDisplacementFoam/createControls.H

...Analysis/solidDisplacementFoam/readMechanicalProperties.H

...solidDisplacementFoam/readSolidDisplacementFoamControls.H

...essAnalysis/solidDisplacementFoam/readThermalProperties.H