Upgrade Jodd 3.5, close #1693