OOIION-1262: Devices return all kinds of agent definitions
Merge pull request #435 from mmeisinger/fix1262_i4_r2

OOIION-1262: Devices return all kinds of agent definitions