bugfixes LP_Cplex-solvers, cmake
mrge conflict