Fixed upgrade guide link and license date
Prepare for release
Merge branch 'release/2.2.1' into 2.2/master