Ensure that agents also set control_exchange

Fixes bug 1100357

Change-Id: I6302edecf851588762d39c99d2f7b2e18ba04bc7
Merge "Ensure that agents also set control_exchange"