ORA fixes for ROOT 6 from Giacomo Govi
Merge pull request #6747 from wmtan/ORAFixesForROOT6

ORA fixes for ROOT 6 from Giacomo Govi