Updated opencv-warco version.

Includes all fixes to it I made before the review. This single huge commit is just a squashed version of the many small ones from upstream.