suzerain: merge baseflow branch

git-svn-id: https://svn.ices.utexas.edu/repos/pecos/suzerain/trunk@42686 0bd85f0b-c151-43b9-a1e9-27231104551f