Changes to allow aMC@NLO production with ExternalLHEProducer (53x)

Backport of https://github.com/cms-sw/cmssw/pull/2689 from 71x