linear: incorperate the upstream ISTL changes since the last synchronization

(reminder: eWoms keeps a copy of the ISTL solvers which allows
pluggable convergence criteria---a feature that unfortunately seems
not to be acceptable for upstream...)