Geant4 10 migr

This is extra modifications for Geant4 10.0 - are not backward compatible