Add OpenCL C++ Headers for 1.1 and 1.2
Switch to the 1.1 Header
Strip OpenCL 1.2 Template Parameters
Revert to Building on Ubuntu - Using OpenCL 1.1