Merge "Updates to CMake treatment of OpenMP" into release-4-6