* Merge branch 'stable-5.3' into stable-5.4

* Allow to resolve a conflict by checking out a file

* Merge branch 'stable-5.3' into stable-5.4

* DirCacheCheckout: don't use deprecated method
* WorkingTreeModifiedEvent: must be fired explicitly after merge

* dfs: Take size as long instead of int
* dfs: Read at the aligned position
* dfs: Add a position argument
* dfs: Move the deeply nested code to its own method

* Add missing @since tag on FileTreeIterator#getLastModifiedInstant

* PacketLineIn: Deprecate the END constant

* Remove unnecessary type specifications
* Use String.isEmpty() instead of comparing to ""
* Use StringBuilder instead of StringBuffer where possible.
* Replace usage of String.indexOf with String.contains where possible

* Fix error log message in ObjectDirectory.handlePackError()
* Properly format pack checksums in PackFile.idx()
* Cancel gc if thread was interrupted
* PackFile: report correct message for checksum mismatch
* ObjectDirectory: Clean up logging
* Bazel: Stop using native.git_repository
* ObjectDirectory: extra logging on packfile exceptions

* FirstWant: tighten first-want line validation

* Update Orbit 2018-09 to R20180905201904

* Use eclipse compiler in Maven build

* Silence API error raised for new CONFIG_SECTION_LFS constant

* Add ObjectIdSerializer
* CheckoutCommandTest: Fix name of created temp file
* IgnoreNodeTest: Suppress deprecation warnings in testEmptyIgnoreNode
* Fix warnings about boxing/unboxing Boolean
* WorkingTreeIterator: Fix warnings about variable hiding
* WorkingTreeIterator: Add NON-NLS suppressions

* Remove redundant @SuppressWarnings("unused")

* Show error message for non-git clients

* reftable: reserve standard PackExt
* reftable: resolve symbolic references
* reftable: support threshold based compaction
* reftable: compact merged tables
* reftable: merge-join reftables
* reftable: lookup by ObjectId unit tests
* reftable: reflog unit tests
* reftable: namespace unit tests
* reftable: bulk operation unit tests
* reftable: basic functionality unit tests
* reftable: debug tools
* reftable: scan and lookup reftable files
* reftable: create and write reftable files
* reftable: file format documentation

* [releng] maven: compile against the Java 1.8 libraries

* Allow setting FileMode to executable when applying patches in ApplyCommand

* Make BaseReceivePack.setAtomic public

* Prepare Neon target platform

* Inline PackWriterBitmapWalker.newRevFilter into callers
* Convert remaining callers of BitmapBuilder.add to use .addObject

* Add test for RefUpdate delete without HEAD

* Add --squash option to org.eclipse.jgit.pgm.Merge

* Make sure all bytes are written to files on close, or get an error.