This reverts commit 4b08be77c9. Add file lock when doing online merging only and associated test.
4b08be77c9