Update 2.1-SNAPSHOT to 2.2-SNAPSHOT