(cherry picked from commit e650d87e)
(cherry picked from commit ca9c52ac)

Conflicts:
	cmake/OpenCVPackaging.cmake