* Merge branch 'master' into stable-5.11

* Allow dir/file conflicts in virtual base commit on recursive merge.

* Merge branch 'stable-5.7'

* JGit v5.6.1.202002131546-r

* Close ObjectReaders in tests
* Close some Repository instances in tests
* Close ObjectInserters in tests

* pgm: Fix missing braces in Push.run()
* pgm: Handle exceptions in Push command
* pgm: Fix missing braces in MergeBase.run()
* pgm: Handle IOException in MergeBase command
* pgm: Fix missing braces in Merge command
* pgm: Handle exceptions in Merge command
* pgm: Fix missing braces in LsTree.run()
* pgm: Handle exceptions in LsTree command
* pgm: Fix missing braces in LsRemote.run()
* pgm: Handle exceptions in LsRemote command
* pgm: Handle exceptions in LsFiles command
* pgm: Fix missing braces in Log.run()
* pgm: Handle exceptions in Log command
* pgm: Handle exceptions in Init command
* pgm: Handle IOException in IndexPack command
* pgm: Fix missing braces in Fetch.run()
* pgm: Handle IOException in Fetch command
* pgm: Handle GitAPIException in Gc command
* pgm: Fix missing braces in DiffTree.run()
* pgm: Handle exceptions in DiffTree command

* Upgrade wagon-ssh to 3.2.0
* Upgrade maven-jxr-plugin to 3.0.0
* Upgrade maven-shade-plugin to 3.2.0
* Upgrade jacoco-maven-plugin to 0.8.2
* Upgrade maven-project-info-reports-plugin to 3.0.0
* Upgrade maven-enforcer-plugin to 3.0.0-M2
* Upgrade maven surefire plugins to 2.22.0
* Ensure same version of maven-surefire-plugin and maven-surefire-report-plugin

* Update API warning filter to 5.1.3

* UploadPack: support deepen-since in protocol v2
* DepthGenerator: remove redundant depth check

* Cleanup: message reporting for HTTP redirect handling

* Make 'inCoreLimit' of LocalFile used in ResolveMerger configurable

* Update Jetty to 9.3.17.v20170317

* SHA1: support reset() and reuse instances

* Remove unused code from class Repository

* Merge branch 'stable-4.5'

* Add ReceivedPackStatistics for PackParser

* Buffer overflow output stream
* Fix overflow stream leak during merge conflicts
* Use local GIT_DIR for overflow during merge conflicts
* Use try-with-resources and BufferedOutputStream for local merge conflicts
* Optimize EolAwareOutputStream for bulk output

* Make sure modifications to config-param trustFolderStat are detected

* Drop warnings about unchecked casts in a few stable select places
* Hide warnings about field hiding in the MyersDiff code
* Fix warnings about missing serialVersionUID
* Fix warning about missing serialVersionUID
* Rename local variables/parameters to remove warnings about hiding
* Remove non-existing source directories from Java 7 test build
* Eliminate warnings for non-nls strings that will never be translated

* [findBugs] Ensure streams are closed in a finally block

* Length of symbolic link is the number of bytes, not characters
* Add delete support to FS
* Dynamically detect if Windows supports symbolic links
* Add symlink support to JGit

* Revert "Add tests for FileUtils.delete and EMPTY_DIREECTORIES_ONLY"

* Consider working tree changes when stashing newly added files

* Ensure resetting on commit id

* Add missing '' characters around quoted variables

* UploadPack: Fix races in smart HTTP negotiation
* PackWriter: Export more statistics
* Do not requeue state vector in stateless RPC fetch
* Wrap excessively long line in BasePackFetchConnection
* Fix smart HTTP client stream alignment errors