The bug you are referring to should not cause any issue when upgrading to 2.2
The issue is during the upgrade from 2.0.1 to 2.1 on SNS-3415 only and was addressed in release 2.2 and onwards
For completeness the workaround for the issue you mention is to do the upgrade by
- clean install of 2.1 // since reported against this release
- Restore database backed up on 2.0.1
In this case issue would in any case not be seen