(PUP-716) Fix up metadata_spec after refactored FileSystem changes
Merge remote-tracking branch 'hlindberg/pup-716_short-lived-objects-in-filesystem' into pup-716_short-lived-objects-in-filesystem