Upgrade Jodd 3.6, close #2173