merge bug22310 into default

Author: Matthias Radestock

test/src/com/rabbitmq/client/test/functional/QosTests.java

@@ -347,6 +347,18 @@ public void testLimitingMultipleChannels()
         ch2.close();
     }
 
+    public void testLimitInheritsUnackedCount()
+        throws IOException
+    {
+        QueueingConsumer c = new QueueingConsumer(channel);
+        declareBindConsume(c);
+        fill(1);
+        drain(c, 1);
+        channel.basicQos(2);
+        fill(2);
+        drain(c, 1);
+    }
+    
     protected void runLimitTests(int limit,
                                  boolean multiAck,
                                  boolean txMode,