Merge "Use JUnit3 as dependency instead of junit.jar" into idea133