Merge "Minor changes to JUnit 4.10 to make it more like 4.12"