Merge "Upgrade JGit to 3.6.2.201501210735-r.40-g23ad3a3"