LOGSTASH-1003 LOGSTASH-1038 fixing both issues in one commit because the rabbitmq input is functionally broken until both are fixed