Merge pull request #680 from vikinghawk/consumerRecoveryRetryFix

consumer recovery retry needs to return the new consumer tag

(cherry picked from commit 9b7baa8)

src/main/java/com/rabbitmq/client/impl/recovery/TopologyRecoveryRetryLogic.java

@@ -166,10 +166,11 @@ public abstract class TopologyRecoveryRetryLogic {
                 } else if (consumer.getChannel() == channel) {
                     final RetryContext retryContext = new RetryContext(consumer, context.exception(), context.connection());
                     RECOVER_CONSUMER_QUEUE.call(retryContext);
-                    consumer.recover();
+                    context.connection().recoverConsumer(consumer.getConsumerTag(), consumer, false);
                     RECOVER_CONSUMER_QUEUE_BINDINGS.call(retryContext);
                 }
             }
+            return context.consumer().getConsumerTag();
         }
         return null;
     };