Merge "Fixes linkage with FFTW + MKL for BLAS/LAPACK" into release-4-6