Merge branch 'stable-6.0' into stable-6.1

* stable-6.0:
  [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory
  Demote severity of some error prone bug patterns to warnings
  UploadPack: Fix NPE when traversing a tag chain

Change-Id: I5e13d5b5414aef97e518898166bfa166c692e60f

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
Simple merge

diff --cc tools/BUILD
Simple merge