Correct v5 version of HGCal geometry
Merge remote-tracking branch 'pr/4313' into merge4313
Limit to the maximum sectors handled by DetId
Merge pull request #4358 from mark-grimes/fix4313

Reapply #4231 on to #4313