Attempt to solve the problem of dirty merging that happened in PR 3717.
resolved merge conflict
add a rule to read the old variable into the new name (checked it works in FWLite interactively)
Merge pull request #4842 from slava77/CMSSW_7_2_X_2014-07-30-0200/from-sdevissc-DataFormatChangeIn72X--fixMerge

addition of soft electron mva, after fixing #4565 merge conflicts