Merge branch 'umat_tests' of git://github.com/KonstantinMatskevich/opencv into umat_tests

Conflicts:
	modules/core/test/test_umat.cpp