Remove references to deprecated config options
Merge pull request #14361 from pass-by-value/remove_config_references2

Remove references to deprecated config options