Fix ambiguity error on intel compiler.

Refs #10169
Merge branch 'feature/10169_vesuvio_mscorr' into develop