ThermoPower.Water.Flow1Dfem2ph has duplicate but non-identical declarations

[maltelenz]

There are duplicated declarations of g in ThermoPower.Water.Flow1Dfem2ph.

Output from System Modeler:

Error: ThermoPower.Water.Flow1Dfem2ph [1:5-1:5] Invalid class definition. Element g is duplicated, but its definitions are not identical.
  constant public Real g = .Modelica.Constants.g_n
  constant public .Modelica.SIunits.Acceleration g(quantity = "Acceleration", unit_ = "m/s2") = .Modelica.Constants.g_n

The two definitions seem to come from:

https://github.com/casella/ThermoPower/blob/82d21eba0d330005899dd50a6a0ceb7d09c4caeb/ThermoPower/Water.mo#L7942

The second one from the base class:

https://github.com/casella/ThermoPower/blob/82d21eba0d330005899dd50a6a0ceb7d09c4caeb/ThermoPower/Water.mo#L5520

I see ThermoPower.Water.Flow1Dfem2ph is marked obsolete using an icon, but it is still used in ThermoPower.Test.DistributedParameterComponents.TestFlow1Dfem2ph. Maybe the usage there should just be replaced with the similarly named ThermoPower.Water.Flow1DFEM2ph (note the uppercase FEM)?