correct typo in comment
This was introduced in http://hg.rabbitmq.com/rabbitmq-server/rev/4852382b462b
small refactor: simplify AMQP version negotiation a little bit
simplify
merge stable into default