Fix agentmap issues with cabled IAs
Merge pull request #2222 from mmeisinger/fix_ooipre

TOOLS: Fix agentmap issues with cabled IAs