relates to #1925.

Reverted changes to ReturnAddressRewriter. Injecting the distributor data address directly to the MessageDrivenSubscriptionManager.