update for changed random generator service
Merge pull request #6975 from civanch/print_materials

Restored functionality to print geometry and weights
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X