OOIION-1788: Small bug fix for instrument agents
Merge pull request #2005 from mmeisinger/fix1788_bug_r2

OOIION-1788: Small bug fix for instrument agents