hydro: update various segbot source branches
Merge pull request #3904 from jack-oquin/master

hydro: update various segbot source branches