Scoped descriptors persist all values

[serialseb]

Because of a change introduced for locking, scoped descriptors now return all lines of the merged entries of default+scoped, making 6 tests fail.

Solution is to add a GetEntriesToPersist method to IPackageDescriptor and update any saves to use this instead of just enumerate over the descriptor.

[serialseb]

Fixed in 2.0.0