Merge "Add junit-dep-4.10 required by testing-support-lib"