problem is fixed in 3.2. Get back the partial fix from maint3.x
Merge pull request #1991 from sancar/fix/testLockInterruption/maint3.x

problem is fixed in 3.2. Get back the partial fix from maint3.x