[582313] Avoid non-Java 5 org.hamcrest
6 files changed