HPCC-11492 Refactor / Cleanup AddPackageMap

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>