PMO-2465 - Java heap space --> unrecoverable error
reduce DB calls by caching fieldMapping, PathMapping & collectorMapping
revert Grid marshaller adjustment on 1.6.x branch