[opencv/f20] (6 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  b99f90c... rebuild (openexr) (*)
  cbac301... Enable OpenCL support; Cleanup python2 unversioned macros.  (*)
  228b4d0... Last commit erase some texts, dunno why. (*)
  9d108bb... Quickfix for opencl (*)
  d852d96... revert pkgcmake2 patch (#1070428) (*)
  b3fd39f... Merge branch 'master' into f20

(*) This commit already existed in another branch; no separate mail sent