Fix points 1) and 2) in ROOT-5468
one last thing ... then master and v5-34 are the same (for TMVA of course only)