This is a follow up to #28760.
Comment From: jhoeller
@sbrannen given the amount of other changes in 6.1 with a potential for subtle upgrade issues, I'm inclined to remove the convention-based attribute support in 6.2 instead, along with #30608.
Comment From: jhoeller
We intend to remove convention-based annotation attribute override support in 7.0 now.