Adapted to latest Gaudi Sink code

reset is now a hidden friend there, and this causes some troubles in case we have local name clashes. See https://fekir.info/post/when-you-cannot-call-hidden-friends-in-cpp/ for details

should go before gaudi/Gaudi!1552 (merged)