Merge remote-tracking branch 'origin/2.4' into merge-2.4

diff --cc modules/core/test/test_math.cpp
Simple merge

diff --cc modules/imgproc/src/contours.cpp
Simple merge

diff --cc modules/imgproc/test/test_imgwarp_strict.cpp
Simple merge

diff --cc modules/ml/src/em.cpp
Simple merge