HPCC-11492 Refactor / Cleanup AddPackageMap

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Actually I think I will add the querySet attribute to the xpath when looking up the existing entry above.