Merge "Add section to the config guide on lock_path"