This now generates files with zero non-whitespace differences between old and new service.json files (except for one bug in the existing files!), and between the removed section of the generated pkgdef, and the new generated pkgdef
David Wengier