HPCC-8949 Ecl packagemap add needs to add each package one time

Signed-off-by: Stuart Ort <stuart.ort@lexisnexis.com>
Merge pull request #4086 from stuartort/pkg_addtoomanypkgs

HPCC-8949 Ecl packagemap add needs to add each package one time

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8964 Don't generate a JFindexfromactivity keyed join for thor

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>