LOGSTASH-1003 LOGSTASH-1038 fixing both issues in one commit because the rabbitmq input is functionally broken until both are fixed
Merge pull request #459 from jkoppe/jkoppe-bunny-rabbitmq-fixes

Fixing both LOGSTASH-1003 and LOGSTASH-1038