Revert of "Remove non-versioned elections (2602)" pull request
Merge pull request #3114 from lutovich/2.1-rolling-upgrade-from-2.0

[2.1] Revert of "Remove non-versioned elections (2602)" pull request