Update to the latest chocosolver.

Here's my attempt at porting to the latest chocosolver. More code in Util can probably be removed too.