Remove overlaps in neutron moderator area
Merge pull request #4219 from bsunanda/Phase2-ft06

Phase2 ft06