Merge "Fixes for CMake finding FORTRAN library names on POWER6" into release-4-5...