Merge "Don't shade org.eclipse.jgit.transport package" into stable-3.6