Update geometries
Remove logical definitions of missing volumes.
Remove duplicate file.
Merge pull request #3234 from ianna/regression-test-update

Geometry -- Regression Test Update
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X