configs-3.17: update configs
Merge branch 'configs-3.17' into pf-3.17