Castor geometry update

Overlap fixes and update for castor geometry.
Automatically ported from CMSSW_7_3_X #6277