Backport "Fix potential double acquisition in `SingleLock`"

[sbrannen]

Backport #3936 to the 5.11.x branch:

• backport code changes (40bc1c4 and 044f5cf?)
• move release notes entry to appropriate file(s)
• backport release notes