Bug 1581: Intermediate merge of task branch MAC-Bug1237-task-branch with trunk

.gitattributes

MAC/APL/CASATools/test/tCasaConverter.cc

MAC/APL/PAC/IBS_Protocol/src/IBS_Protocol.prot

MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt

MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc

MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h

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

MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h

MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt

MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc

MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h

MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc

MAC/APL/PAC/ITRFBeamServer/src/StatCal.h

MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc

MAC/APL/PAC/ITRFBeamServer/src/iBeamServer.conf.in

MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt

MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc

MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.log_prop

MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc

MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc