Bug 1448: Merged development branch (r14778:HEAD) with the trunk

.gitattributes

CEP/pyparmdb/src/CMakeLists.txt

CMake/LofarMacros.cmake

CMake/LofarPackage.cmake

CMake/LofarPackageVersion.cmake

CMake/MACAddProtocol.cmake

CMake/MakePackageVersion.cmake

CMake/MakePackageVersion.cmake.in

CMake/UpdatePackageVersion.cmake.in

CMake/makeversion

LCS/Common/src/CMakeLists.txt

LCS/pyparameterset/src/CMakeLists.txt

LCS/pyparameterset/src/pyparameterset.cc

MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.cc

MAC/APL/CUDaemons/src/LogClient/LogClient.cc

MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc

MAC/APL/PAC/Beam_Server/src/BeamServer.cc

MAC/APL/PAC/Cal_Server/src/CalServer.cc

MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc

RTCP/CNProc/src/CN_Processing_main.cc