Fixes after rebasing pressure-cg branch (60d99b0e) onto master (6da4570a)

23 jobs for pressure-cg-rebased in 15 minutes and 26 seconds (queued for 2 seconds)
latest
Name Stage Failure
failed
gcc_10_mpionly_dbg Pretest
[100%] Linking CXX executable Benchmark_03_BlendedAdvection
[100%] Linking CXX executable Benchmark_02_SwirlingAdvection
[100%] Built target Benchmark_03_BlendedAdvection
[100%] Linking CXX executable Benchmark_04_BlendedAdvectionDiffusion
[100%] Built target Benchmark_02_SwirlingAdvection
[100%] Built target Benchmark_04_BlendedAdvectionDiffusion
make: *** [Makefile:141: all] Error 2
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
clang_10.0_eigen_petsc Pretest
20 errors generated.
make[2]: *** [apps/stokesPressureCorrectionScheme/CMakeFiles/StokesPressureCorrectionScheme.dir/StokesPressureCorrectionScheme.cpp.o] Error 1
apps/stokesPressureCorrectionScheme/CMakeFiles/StokesPressureCorrectionScheme.dir/build.make:62: recipe for target 'apps/stokesPressureCorrectionScheme/CMakeFiles/StokesPressureCorrectionScheme.dir/StokesPressureCorrectionScheme.cpp.o' failed
CMakeFiles/Makefile2:19117: recipe for target 'apps/stokesPressureCorrectionScheme/CMakeFiles/StokesPressureCorrectionScheme.dir/all' failed
make[1]: *** [apps/stokesPressureCorrectionScheme/CMakeFiles/StokesPressureCorrectionScheme.dir/all] Error 2
Makefile:140: recipe for target 'all' failed
make: *** [all] Error 2
Cleaning up file based variables
ERROR: Job failed: exit code 1