Merge "Migrade JUnitMatchers references"