PHOENIX-129 Improve MapReduce-based import (GabrielReid)