HPCC-11492 Refactor / Cleanup AddPackageMap

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
HPCC-11492 Update based on review

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Merge pull request #6258 from afishbeck/packageMapAddCleanup

HPCC-11492 Refactor / Cleanup AddPackageMap

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>