Fix windows build. Refs #9202

Also fixed one cppcheck warning
Merge branch 'feature/9202_TopazMDNorm' into develop