bug: #3625598 Recover from stale imports instead of extending the feed lock indefinitely.

Ben Stallingsrequested to merge
issue/feeds-3625598:3625598-feeds-lock-is into 8.x-3.x

Co-Authored-By: Claude Sonnet 5.5 noreply@anthropic.com

Closes #3625598

Merge request reports