[Blocking] Boats with riders not getting teleported by /teleport command while in water

1.6.0.0_x64_UAP.Release_Test
Release_980905

Summary:
Using /Teleport on boats while a player is riding does not teleport the boat (or the player) while the boat is in water.
It may be worth noting that /teleport with rider does work if the boat is not in water, but the command only works "every other" time. I have made a separate bug for this.

Impact:
Prevents boat/player combos from ever being teleported to a new area. Breaking for lots of boat based content.

What is the impact to players/partners if we don't fix?
The workaround is to teleport just the player to the new spot and then spawn a boat next to them and require them to get in, but this scenario happens enough this is a pretty bad player experience and requires changing level geometry also.

Repro Steps:
Creative mode,
grab a boat,
put boat in water,
get in boat,
type in: /teleport @e[type=boat,r=2] ~ ~5 ~

Observed Results:
/teleport @e[type=boat,r=2] ~ ~5 ~ yields no result.

Expected Results:
It is expected that the command would teleport the boat (with the player in it) up 5 blocks in the y direction.

Screenshots/Videos attached:

no