Merge "Drop lock_path section from config guide"