Merge remote branch 'origin/feature/6722_POWGEN_K4'
Remove sections from git config when they are empty. Refs #6824
Merge branch 'bugfix/6824_gittest_fix' into develop