Change deprecations to be removed for 2.0.0, not 9.x-1.0

As mentioned in #3126115: Create a 2.0.0 release, I’m pretty sure our next major version will be 2.0.0, not 9.x-1.0. Therefore, we should change all our deprecation messages and tags to reflect that correctly.