(PUP-716) Make more tests in fileset_spec pass
Merge remote-tracking branch 'hlindberg/pup-716_short-lived-objects-in-filesystem' into pup-716_short-lived-objects-in-filesystem
(PUP-716) Fix up fileset_spec (1 failing test remains)

One test is still failing.