Fix for Bug NMS-6757 - Part II

It turns out that the current implementation of the
DefaultDataCollectionConfigDao class was not adding the resource types
defined inside the snmp-collection (like the old format of the files),
it was checking only the resource types defined on the
datacolelction-group files.
Merge remote-tracking branch 'origin/1.12'
NMS-6757 - Part II - Fixing compiling issues