Merge branch 'stable' into 4.0.x-stable

Conflicts:
	src/main/java/com/rabbitmq/client/RecoveryListener.java

Author: acogoluegnes

pom.xml

@@ -644,7 +644,7 @@
         <repository>
           <id>bintray-rabbitmq-maven-milestones</id>
           <name>rabbitmq-maven-milestones</name>
-          <url>https://api.bintray.com/maven/rabbitmq/maven-milestones/java-client/;publish=1</url>
+          <url>https://api.bintray.com/maven/rabbitmq/maven-milestones/java-client-milestone/;publish=1</url>
         </repository>
       </distributionManagement>
     </profile>

src/main/java/com/rabbitmq/client/RecoveryListener.java

@@ -22,6 +22,18 @@
  * @since 3.3.0
  */
 public interface RecoveryListener {
+    /**
+     * Invoked when automatic connection recovery has completed.
+     * This includes topology recovery if it was enabled.
+     * @param recoverable a {@link Recoverable} connection.
+     */
     void handleRecovery(Recoverable recoverable);
+
+    /**
+     * Invoked before automatic connection recovery starts.
+     * This means no recovery steps were performed at this point
+     * during recovery process.
+     * @param recoverable a {@link Recoverable} connection.
+     */
     void handleRecoveryStarted(Recoverable recoverable);
 }