Merge "Removed CMake warning for recent OpenMPI versions" into release-4-5-patches