Fix agentcontrol data product issue and polish output
Merge pull request #2080 from mmeisinger/fix1827_ac

TOOLS: Fix agentcontrol data product issue and polish output