Merge branch 'stable-6.0' into stable-6.1

* stable-6.0:
  Add missing since tag for SshBasicTestBase
  Add missing since tag for SshTestHarness#publicKey2
  Silence API errors
  Prevent infinite loop rescanning the pack list on PackMismatchException
  Remove blank in maven.config

Change-Id: Ia01c5ac5259b8820afb823d97bee247b5a5fb14a

diff --cc org.eclipse.jgit/.settings/.api_filters
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java
Simple merge