Used proposed FJ 4.1-SNAPSHOT release
Got building with Groovy 2.2.2
Switch back to official FJ 3.1, moved functions that change to separate class to make it easier to upgrade later