Merge pull request #3538 from pks-t/pks/index-memory-leak index: always queue `remove_entry` for removal