Remove custom_tab_* settings - refs #7180
Merge remote-tracking branch 'origin/1.9.x' into 1.9.x