minor updates for Geant4 10
Merge pull request #4009 from civanch/g4cleanup

Minor updates for Geant4 10