Fix agentcontrol data product issue and polish output
Merge pull request #2081 from mmeisinger/fix1827_ac_r2

TOOLS: Fix agentcontrol data product issue and polish output