Refs #9894 fix warning
Merge branch 'feature/9894_Vickie_slow_unit_tests' into develop