Upgrade to Groovy 2.3.6 and FJ 4.2-beta-2-SNAPSHOT