Changes needed by Conditions
Merge pull request #1994 from wmtan/ConditionsCode

ROOT6 -- Changes needed by Conditions