merge bug20296 into v1_5

Author: Matthias Radestock

src/com/rabbitmq/client/impl/ChannelN.java

@@ -193,8 +193,12 @@ public void releaseChannelNumber() {
                                                                          command,
                                                                          this);
             synchronized (_channelMutex) {
-                processShutdownSignal(signal, true, true);
-                quiescingTransmit(new Channel.CloseOk());
+                try {
+                    processShutdownSignal(signal, true, false);
+                    quiescingTransmit(new Channel.CloseOk());
+                } finally {
+                    notifyOutstandingRpc(signal);
+                }
             }
             notifyListeners();
             return true;