fix merge problem

A  recent carry forward  from the 7_2_X branch did not merge properly, causing compilation errors in the ROOT6 IB.
This pull request simply updates two files to match those in the 7_2_X branch.  This fixes the compilation errors.
Please merge promptly.