update 2.2 branch and git ignore files