fix build to properly omit **/failing/*.java
Merge branch '2.4'