Correct cppcheck warnings

Refs #10672
Merge branch 'feature/10672_save_button_updates' into develop