Merge pull request #4769 from vrabaud/master

bump OpenCV for Hydro
bump OpenCV in Groovy