fixes merge of upstream into develop

apps/cpu/DamBreak/CMakeLists.txt

apps/cpu/DamBreak/main.cpp

apps/cpu/FallingSphere/FallingSphere.cpp

apps/cpu/JetBreakup/JetBreakup.cpp

apps/cpu/LiggghtsApp/LiggghtsApp.cpp

apps/cpu/MultiphaseSymmetryTest/CMakeLists.txt

apps/cpu/MultiphaseSymmetryTest/droplet.cpp

apps/cpu/Nozzle/nozzleSinglePhase.cpp

apps/cpu/NozzleMultiphase/nozzleMultiPhase.cpp

src/cpu/LiggghtsCoupling/LBM/IBsharpInterfaceLBMKernel.cpp

...eFlow/BoundaryConditions/MultiphasePressureBCStrategy.cpp

...ltiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp

...MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.h

...core/BoundaryConditions/NonReflectingInflowBCStrategy.cpp

...ore/BoundaryConditions/NonReflectingOutflowBCStrategy.cpp

...nditions/NonReflectingOutflowWithRelaxationBCStrategy.cpp

src/cpu/core/BoundaryConditions/SlipBCStrategy.cpp

.../core/SimulationObservers/InSituVTKSimulationObserver.cpp