CRUNCH-388: Fix memory and spark issues discovered testing w/Oryx