Task #2997: Merged task branch with the trunk and resolved two conflicts

.gitattributes

CEP/Calibration/BBSControl/src/MultiStep.cc

CEP/Calibration/BBSControl/src/SolveStep.cc

CEP/Pipeline/framework/lofarpipe/support/baserecipe.py

CEP/Pipeline/framework/lofarpipe/support/group_data.py

CEP/Pipeline/framework/lofarpipe/support/lofaringredient.py

CEP/Pipeline/recipes/sip/CMakeLists.txt

CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py

CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py

CEP/Pipeline/recipes/sip/bin/startPython.sh

CEP/Pipeline/recipes/sip/demixing/bbs_CasA.parset

CEP/Pipeline/recipes/sip/demixing/bbs_CasA_smoothcal.parset

CEP/Pipeline/recipes/sip/demixing/bbs_CygA.parset

CEP/Pipeline/recipes/sip/demixing/bbs_CygA_smoothcal.parset

CEP/Pipeline/recipes/sip/demixing/bbs_HerA.parset

CEP/Pipeline/recipes/sip/demixing/bbs_HerA_smoothcal.parset

CEP/Pipeline/recipes/sip/demixing/bbs_HydA.parset

CEP/Pipeline/recipes/sip/demixing/bbs_HydA_smoothcal.parset

CEP/Pipeline/recipes/sip/demixing/bbs_TauA.parset

CEP/Pipeline/recipes/sip/demixing/bbs_TauA_smoothcal.parset