Merge "Remove wf* function dependencies from FSLockManager"