updated for 5.3.12.patch2
cmssw-patch: updated fro 5.3.12.patch3
fix3 to allow 2 pythia versions
additional fix

Merge branch 'upmaster' into second_pythia8