MCO-351 Fix rabbitmq connector under 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.

This PR fixes the test breakage introduced in #198 and supercedes it.