Catch uncaught merge problem from bug21987

Author: tonyg

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

@@ -31,6 +31,7 @@
 
 package com.rabbitmq.client.test.functional;
 
+import com.rabbitmq.client.test.BrokerTestCase;
 import java.util.Arrays;
 import java.io.IOException;