Issue #3192: fix some bugs for releasing v2.2.1

fix some bugs for releasing v2.2.1