Small change to avoid ambiguous overloaded method
Added cast for EntityCondition to avoid ambiguous method calls
Updated groovy to 2.1.9