Merge pull request #3499 from nrwahl2/nrwahl2-based_drops
Drop support for rolling upgrades from < 2.0.0, start removing legacy code