Merge: from treemanager_oob_nre - Fixes NRE caused by trees close to the edge of the world Tests: throw away unit tests that sampled edges of the tree manager's grid