Fix agentmap issues with cabled IAs
Merge pull request #2223 from mmeisinger/fix_ooipre_r2

TOOLS: Fix agentmap issues with cabled IAs