Merge changes leading to 1.8.4

diff --cc git-core.spec
index 2ca292b1b2127567360aadfe461e2fafc88e8bd1,796226c9626ffda005fa4d8a86652e6b9dce0b45..9e32b1d218864e1ca7f6009b95e49b355dfb45f9
--- 1/git-core.spec
--- 2/git-core.spec
+++ b/git-core.spec
@@@ -594,9 -590,7 +594,8 @@@ f
  %exclude %{_libdir}/%{name}/git-svn
  %exclude %{_libdir}/%{name}/git-archimport
  %exclude %{_libdir}/%{name}/git-cvs*
 +%exclude %{_libdir}/%{name}/git-imap-send
  %exclude %{_libdir}/%{name}/git-instaweb
- %exclude %{_libdir}/%{name}/git-remote-testpy
  %exclude %{_libdir}/%{name}/git-remote-testsvn
  %exclude %{_libdir}/%{name}/*email*