Catkinize groovy-devel

This is just a backport of the catkinization from hydro-devel