JENKINS-25353: Cleaned up index.lock file when checkout is aborted
Test index.lock removal - JENKINS-25353
Merge remote-tracking branch 'upstream/master' into master-fix-javadoc-for-java-8

Conflicts:
	src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java