Merge commit 'origin/master' into olesenm

...tions/solvers/incompressible/channelOodles/createFields.H

applications/solvers/incompressible/oodles/createFields.H

...olvers/multiphase/compressibleLesInterFoam/createFields.H

...ns/solvers/multiphase/interPhaseChangeFoam/createFields.H

...tions/solvers/multiphase/lesCavitatingFoam/createFields.H

.../multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C

.../multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H

applications/solvers/multiphase/lesInterFoam/createFields.H

applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean

applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake

...PhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H

...ulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H

...Models/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H

...gModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H

...facialModels/dragModels/SchillerNaumann/SchillerNaumann.H

...nterfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H

...PhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H

...erFoam/interfacialModels/dragModels/dragModel/dragModel.H

...ltiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files

...iphase/twoPhaseEulerFoam/kineticTheoryModels/Make/options