Remove workarounds for two ROOT6 bugs that were fixed
Merge pull request #2375 from wmtan/RemoveWorkaroundsForFixedROOT6Bugs

Remove workarounds for two ROOT6 bugs that were fixed