Issue #2926412 by Wim Leers: Follow-up for #2883680: deprecation message indicates the wrong deprecation introduction version (cherry picked from commit 2eaceaa4)
