Refs #7348. Fix for Windows.
Merge branch 'feature/7348_turnoff_nonortho_nonHKL' into develop