Task #3204: Re-applied reintegrate merge, after fixing some files that were mysteriously altered in the previous reintegrate merge. Among these files were: lofar_config.h.cmake, CMake/LofarGeneral.cmake, and CMake/FindPVSS.cmake.