WIP: Upgrade to Sisu 2.5.0 (now a thin wrapper around Eclipse-Sisu)