Merge pull request #2221 from asmorkalov:ocv_test_install_custom