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.

plugins/mcollective/connector/rabbitmq.rb

@@ -332,7 +332,9 @@ def make_target(agent, type, collective, reply_to=nil, node=nil)

        target = {:name => "", :headers => {}, :id => nil}

        if get_bool_option("rabbitmq.use_reply_exchange", false)
        if reply_to
          reply_path = reply_to
        elsif get_bool_option("rabbitmq.use_reply_exchange", false)
          reply_path = "/exchange/mcollective_reply/%s_%s" % [ @config.identity, $$ ]
        else
          reply_path = "/temp-queue/mcollective_reply_%s" % agent

spec/unit/plugins/mcollective/connector/rabbitmq_spec.rb

@@ -432,8 +432,8 @@ class ::Stomp::Error::NoCurrentConnection < RuntimeError ; end
          msg.stubs(:ttl).returns(60)
          msg.expects(:discovered_hosts).returns(["one", "two"])

          connection.expects(:publish).with('/exchange/mcollective_directed/one', 'msg', {'reply-to' => '/temp-queue/mcollective_reply_agent', 'expiration' => '70000'})
          connection.expects(:publish).with('/exchange/mcollective_directed/two', 'msg', {'reply-to' => '/temp-queue/mcollective_reply_agent', 'expiration' => '70000'})
          connection.expects(:publish).with('/exchange/mcollective_directed/one', 'msg', {'reply-to' => '/topic/mcollective', 'expiration' => '70000'})
          connection.expects(:publish).with('/exchange/mcollective_directed/two', 'msg', {'reply-to' => '/topic/mcollective', 'expiration' => '70000'})

          connector.publish(msg)
        end