Upgrading H2 and groovy
Merge branch '1_2_X'