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

OOIION-1262: Devices return all kinds of agent definitions