Merge branch 'stable'

Conflicts:	pom.xml

Author: michaelklishin

pom.xml

@@ -30,21 +30,20 @@
  </license>
  </licenses>
 
- <scm>
+ <developers>
+ <developer>
+ <email>info@rabbitmq.com</email>
+ <name>Team RabbitMQ</name>
+ <organization>Pivotal Software, Inc.</organization>
+ <organizationUrl>https://rabbitmq.com</organizationUrl>
+ </developer>
+ </developers>
+
+ <scm>
  <url>https://github.com/rabbitmq/rabbitmq-java-client.git</url>
  <connection>scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git</connection>
  </scm>
 
- <developers>
- <developer>
- <id>rabbitmq.team</id>
- <name>The RabbitMQ Team</name>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- </developers>
-
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  </properties>