Remove config values when git-checkbuild starts on branch. Refs #6824
Merge branch 'bugfix/6824_gittest_fix' into develop