Overlap fixed. Various internal fixes
Merge pull request #2815 from robervalwalsh/my-710pre4-bril-geometry

Geometry/ForwardCommonData -- PLT fixes