Merge branch 'stable-4.6' into stable-4.7

* stable-4.6:
  Fix feature versions imported by feature org.eclipse.jgit.pgm
  Prepare 4.5.6-SNAPSHOT builds
  JGit v4.5.5.201812240535-r
  Call AdvertiseRefsHook before validating wants

Change-Id: If637694f80dbd1e774d60c672fe78a6500650bb8
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index 1e5fbc1818980d9dc3cc15539e9024fef45d7bec,2c91754a308c0937dd5cd70b1badc3c1703d3230..20bd74115a627cc720994c8851ea29bb8ee56ee1
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@@ -31,8 -31,8 +31,8 @@@
           version="0.0.0"/>
  
     <requires>
-       <import feature="org.eclipse.jgit" version="4.7.1" match="equivalent"/>
-       <import feature="org.eclipse.jgit.lfs" version="4.7.1" match="equivalent"/>
 -      <import feature="org.eclipse.jgit" version="4.6.2" match="equivalent"/>
 -      <import feature="org.eclipse.jgit.lfs" version="4.6.2" match="equivalent"/>
++      <import feature="org.eclipse.jgit" version="4.7.7" match="equivalent"/>
++      <import feature="org.eclipse.jgit.lfs" version="4.7.7" match="equivalent"/>
     </requires>
  
     <plugin

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
Simple merge