updated data for SURF regression tests
updated nonfree/surf data for the sanity check mode in the performance tests
Merge branch vpisarev:surf_fixes
Merge branch '2.4'