Merge remote-tracking branch 'refs/remotes/origin/master' into mappings

Conflicts:
	src/main/java/org/elasticsearch/river/rabbitmq/RabbitmqRiver.java
merge