4.x
ml: simplify interfaces of SimulatedAnnealingSolver
Merge remote-tracking branch 'upstream/3.4' into merge-3.4