Add water source long actions

Supplants #9760.

This adds two new long actions, one for filling containers from normal water sources and one from salt water sources. Water is added at a rate of 3 charges per turn and is cancelable just like any other long action.
What are you trying to do here?  This broke other activities very badly.