Provides 2.1 with the ability to upgrade directly from 1.9

Supersedes #2667