Fix reply_to when using RabbitMQ and custom discovery

If reply_to is set use it. In the case of using a custom discovery method,
the direct addressing method is used. In this case we want to keep the
reply_to if it is set by the command line.