Trying to make ocl surf work

1. Added more sync to reduction.
2. Turned off Image2D feature. Probably its support is not detected correctly.
3. Temporary disabled descriptor tests - can't localize a problem of the ocl descriptor.

modules/nonfree/test/test_main.cpp

@@ -23,29 +23,29 @@ int main(int argc, char** argv)
         {
             cmd.printParams();
             return 0;
-        }
+    }
 
         printCudaInfo();
 
         if (cmd.get<bool>("info"))
-        {
+    {
             return 0;
-        }
+    }
 
         int device = cmd.get<int>("device");
         if (device < 0)
-        {
+    {
             DeviceManager::instance().loadAll();
 
             std::cout << "Run tests on all supported devices \n" << std::endl;
-        }
+    }
         else
-        {
+    {
             DeviceManager::instance().load(device);
 
             DeviceInfo info(device);
             std::cout << "Run tests on device " << device << " [" << info.name() << "] \n" << std::endl;
-        }
+}
 
         TS::ptr()->init("cv");
         InitGoogleTest(&argc, argv);
@@ -58,7 +58,7 @@ int main(int argc, char** argv)
         return -1;
     }
     catch (...)
-    {
+{
         std::cerr << "Unknown error" << std::endl;
         return -1;
     }