Merge remote-tracking branch 'origin/testing' into developer ignoring whitespace!

Conflicts:
	cmake/Modules/FindPSANA.cmake
	source/cheetah_ana_pkg/src/cheetah_ana_mod.cpp
	source/libcheetah/src/saveCXI.cpp
	source/libcheetah/src/saveFrame.cpp
	source/libcheetah/src/setup.cpp
	source/libcheetah/src/worker.cpp
Fix small conflicts that were not properly solved