Start developing version 2.2

Change-Id: Id150ac61f8daf60bd7da5f1df3fc7f56a6858abd