Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10"