Server startup ChunkEvent FarmlandWaterManager crash

Hello everyone, I posted this bug about a month ago on an older Forge version and it seems that the bug still exists on the newer Forge versions. I am running a 1.12.2 Forge server running 14.23.5.2837. The crux of the issue is this:

[17:50:07] [Server thread/ERROR] [FML]: Exception caught during firing event net.minecraftforge.event.world.ChunkEvent$Unload@66e85964:
java.util.ConcurrentModificationException: null
	at java.util.WeakHashMap$HashIterator.nextEntry(Unknown Source) ~[?:1.8.0_211]
	at java.util.WeakHashMap$KeyIterator.next(Unknown Source) ~[?:1.8.0_211]
	at net.minecraftforge.common.FarmlandWaterManager.removeTickets(FarmlandWaterManager.java:127) ~[FarmlandWaterManager.class:?]
	at net.minecraftforge.common.ForgeInternalHandler.onChunkUnload(ForgeInternalHandler.java:104) ~[ForgeInternalHandler.class:?]
	at net.minecraftforge.fml.common.eventhandler.ASMEventHandler_889_ForgeInternalHandler_onChunkUnload_Unload.invoke(.dynamic) ~[?:?]
	at net.minecraftforge.fml.common.eventhandler.ASMEventHandler.invoke(ASMEventHandler.java:90) ~[ASMEventHandler.class:?]
	at net.minecraftforge.fml.common.eventhandler.EventBus.post(EventBus.java:182) [EventBus.class:?]
	at net.minecraft.world.chunk.Chunk.func_76623_d(Chunk.java:879) [axw.class:?]
	at net.minecraft.world.gen.ChunkProviderServer.func_73156_b(ChunkProviderServer.java:269) [on.class:?]
	at net.minecraft.world.WorldServer.func_72835_b(WorldServer.java:207) [oo.class:?]
	at net.minecraft.server.MinecraftServer.func_71190_q(MinecraftServer.java:756) [MinecraftServer.class:?]
	at net.minecraft.server.dedicated.DedicatedServer.func_71190_q(DedicatedServer.java:397) [nz.class:?]
	at net.minecraft.server.MinecraftServer.func_71217_p(MinecraftServer.java:668) [MinecraftServer.class:?]
	at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:526) [MinecraftServer.class:?]
	at java.lang.Thread.run(Unknown Source) [?:1.8.0_211]

This issue was discussed here: https://github.com/MinecraftForge/MinecraftForge/pull/5861 but the PR hasn't been merged yet. I would appreciate it if someone could look into this issue and fix it.

Here is the full crash log: https://untolddestiny.com/downloads/crashes/crash-2019-07-31_17.50.07-server.txt

The full debug log: https://untolddestiny.com/downloads/crashes/debug2.log

Mod list: https://untolddestiny.com/downloads/crashes/FullModList.pdf