Merge same change on heads

Author: Michael Bridgen

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

@@ -31,13 +31,14 @@
 
 package com.rabbitmq.client.test.functional;
 
-import com.rabbitmq.client.test.BrokerTestCase;
 import java.util.Arrays;
 import java.io.IOException;
 
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.QueueingConsumer;
 
+import com.rabbitmq.client.test.BrokerTestCase;
+
 public class Recover extends BrokerTestCase {
 
     String queue;