Merge pull request #14 from apache/junit5

Various junit fixes