Fixing both LOGSTASH-1003 and LOGSTASH-1038

rabbitmq input is functionally broken until both are fixed so I figured I'd submit the pull request with both.

I plan to write some tests, but definitely didn't want the tests to hold up others from having a fix.