rebase 1604: fixes to HLTrigger.HLTcore.TriggerExpressionData and adaptations to the multithreaded fwk