Merge "base: genlock: Correct the lock file reference count." into msm-3.4