refs #7957. Fix compiler warnings.
Merge branch 'feature/7957_log_scale' into develop