Merge branch 'macro_removal_M2' into 'master'

source/App/DecoderApp/DecAppCfg.cpp

source/App/DecoderApp/DecAppCfg.h

source/App/EncoderApp/EncApp.cpp

source/App/EncoderApp/EncAppCfg.cpp

source/App/EncoderApp/EncAppCfg.h

source/App/Parcat/parcat.cpp

source/Lib/CommonLib/AdaptiveLoopFilter.cpp

source/Lib/CommonLib/AdaptiveLoopFilter.h

source/Lib/CommonLib/BinaryDecisionTree.cpp

source/Lib/CommonLib/BinaryDecisionTree.h

source/Lib/CommonLib/Buffer.cpp

source/Lib/CommonLib/Buffer.h

source/Lib/CommonLib/CodingStatistics.h

source/Lib/CommonLib/CodingStructure.cpp

source/Lib/CommonLib/CodingStructure.h

source/Lib/CommonLib/CommonDef.h

source/Lib/CommonLib/ContextModelling.cpp

source/Lib/CommonLib/ContextModelling.h

source/Lib/CommonLib/Contexts.cpp

source/Lib/CommonLib/Contexts.h