accept non-default resource URI on the collect client
Merge branch 'enum_info' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows into enum_info