Increment the version number to be 2.2
Merge branch 'tgates/2.1' into rel/2.1

* tgates/2.1:
  Increment the version number to be 2.2
Merge branch 'rel/2.1'

* rel/2.1:
  Increment the version number to be 2.2