Merge "Remove junit-runner and revert files to standard JUnit 4.10"