emaint merges: Replace .append() with .add() for set variables (bug 520542)

pkg_atoms and pkg_invalid_entries were changed to sets, but were not updated
in the function that added to them.