Switch to groovy 2.1.6