Refs #10246 Undoing last commit because of errors on other platforms
Merge branch 'feature/10246_Fix_os10.9_clang_failed_tests' into develop