Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10