Upgrade groovy to 2.3.6