refs #8752. Fix single cpp check issue.
refs #8752. Cpp check issue around if.
Revert "refs #8752. Cpp check issue around if."

This reverts commit 5b9a7123ccdc0031afe37551cf187f2edd49129c.
Revert "Revert "refs #8752. Cpp check issue around if.""

This reverts commit f9b415ab8b6f4108022cad31c0f839bcd71d0702.
refs #8752. Warning is not required.
refs #8752. Kill warning and proper fix.
Merge remote-tracking branch 'origin/feature/8752_fix_cpp_check_issue'