25527 Only test 2.x upgrades in 2.x branch