Merge "Add junit to eclipse classpath"