Merge pull request #466 from nextcloud/backport/452/stable29

[stable29] fix: Use proper user when unlocking an app locked file with occ

lib/Service/LockService.php

@@ -281,7 +281,7 @@ public function unlockFile(int $fileId, string $userId, bool $force = false, int
 		}
 
 		if ($force) {
-			$userId = $lock->getOwner();
+			$userId = in_array($lock->getType(), [ILock::TYPE_USER, ILock::TYPE_TOKEN]) ? $lock->getOwner() : $userId;
 			$lockType = $lock->getType();
 		}