testlib and junit #5646

     <!-- testlib deps. Only put testlib dependencies here, which are testlib packages
      that correspond to another non-test package. Put pure test dependencies (e.g.
      junit) in the main pom.xml. -->
      <dependency>
        <groupId>com.google.guava</groupId>
        <artifactId>guava-testlib</artifactId>
        <version>${guava.version}</version>
      </dependency>
      <dependency>
        <groupId>junit</groupId>
        <artifactId>junit</artifactId>
        <version>4.12</version>
</dependency>