Resolve merge conflict from main

#define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING         /* Eri: Fix incorrect use of stack variable used for channel aware config file */

#define COMBINED_FORMAT_SIGNALING                       /* VA: Introduce a signaling bit for combined format coding */

#define FIX_356_ISM_METADATA_SYNC                       /* Eri: issue 356: Metadata out-of-synch for -no_delay_comp */   

// #define FIX_356_ISM_METADATA_SYNC                       /* Eri: issue 356: Metadata out-of-synch for -no_delay_comp */   

#define FIX_446_STEREO_DMX_CRASH                        /* FhG: fix discrepancy with EVS code that could cause crashes in rare cases */