Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD