Merge "Add Junit4 to the classpath for CollectAllTests"