Changes to allow wmLHE and GEN-SIM to run in a single job (71x)

Backport of https://github.com/cms-sw/cmssw/pull/4610