Remove deprecated configuration options. Fixes 3271.
Remove the deprecation config tests. Lower the salt call's timeout to 30 secs.