Revert "Fixes #16833: Remove show_avatar_threshold config option."

This reverts commit 3715bfade978933f0c99fdf1b1f4304f607afc2c.
Merge branch 'master' into ftp
Move deprecated constants to bottom of the constant file with other deprecated ones