Merged refs/pull/1518/head from repository cms-sw
migration to geant4 10.0
Merge pull request #1531 from civanch/Geant4-10-migr

Geant4.10 Migration -- Fix compilation errors