Merge heads

Author: Simon MacMullen

test/src/com/rabbitmq/client/test/server/DurableBindingLifecycle.java

@@ -143,7 +143,8 @@ public void testTransientExchangeDurableQueue() throws IOException {
         // the transient X alive
         if (clusteredConnection != null) {
             channel.exchangeDeclare("transientX", "fanout", false);
-            declareAndBindDurableQueue("durableQ", "transientX", "");
+            channel.queueDeclare("durableQ", true, false, false, null);
+            channel.queueBind("durableQ", "transientX", "");
 
             restartPrimary();