remove stage, submit after each step
replace OPENCV_WITH_CONTRIB with OPENCV_EXTRA_MODULES
refactor OPENCV_FEATURES