swap over two samples from extendedgen to generator
Merge pull request #5571 from franzoni/swapt-gen-ext-CMSSW_7_2_0_pre6

Swap over two samples from extendedgen to generator
Merge remote branch 'origin/CMSSW_7_3_X' into CMSSW_7_0_X