[2.1.5] Load error with Bob's Logistics: boat (cargo-wagon) inherits next_upgrade, "Rolling stocks must have identical connection_distance"

[Cbow2018]

With Cargo Ships 2.1.5 and Bob's Logistics 3.0.0 on Factorio 2.1.11, the game fails at the prototype stage:
"Failed to load mods: Error while running setup for entity prototype "boat" (cargo-wagon):
Rolling stocks must have identical connection_distance when next_upgrade is set."

Mods offered for disabling: cargo-ships (2.1.5) and MoreTooltips (1.0.4), MoreTooltips appears to be incidental, not a cause.
Present on 2.1.4, still present after updating to 2.1.5.

Disabling Bob's Logistics resolves the error and the game loads normally.

Reproduction

1. Factorio 2.1.11, Cargo Ships 2.1.5, Bob's Logistics 3.0.0 enabled.
2. Launch: fails at prototype setup with the error above.
3. Disable Bob's Logistics and it loads fine.

Mods:

• Factorio: 2.1.11
• Cargo Ships: 2.1.5
• Bob's Logistics: 3.0.0
• Cargo Ships Graphics: 2.1.0
• Cargo Ships: Floating Electric Pole: 2.1.0
• Cargo Ships: Oil Rig: 2.1.2

[Cbow2018]

Potentially due to Bob's Logistics adding upgraded cargo wagon tiers and sets next_upgrade on the vanilla cargo wagon.