Pull in catkinized version as hydro branch