Merge branch 'stable'

 Conflicts:
	src/test/java/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java

Author: acogoluegnes

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

@@ -28,7 +28,6 @@
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.junit.Test;
@@ -41,10 +40,9 @@
 
 class RejectingConsumer extends DefaultConsumer {
     private CountDownLatch latch;
-    private volatile Map<String, Object> headers;
+    private Map<String, Object> headers;
     private AtomicLong counter;
 
-
     public RejectingConsumer(Channel channel, CountDownLatch latch) {
         super(channel);
         this.latch = latch;