APIGW-979: improved MDC handling / clearing