Backport from 3.0: Fixed bug that made that the lock was shared between owners