Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that