Re-enable upgrade nfr test in 2.1

Upgrade NFR test purposefully does not work until the 2.1 release since the 2.0 changes are breaking changes. In the mean while in #3305, we have added a Skip to skip over these upgrade NFR tests, however when we are testing for the 2.1 release, we need to re-enable these tests.