Merge "EntropyMixer: ensure new seed file is as good as old one"