more fixes for reflex -> root 6 migration in conditions
Merge pull request #1619 from apfeiffer1/ap-root6-condMigration

ROOT6 -- More fixes for reflex -> root 6 migration in conditions