Number of collectors and notification agents depends on core count

Change-Id: Icea33090c7e8aa5503b83c129af87023383e2398
Merge "Number of collectors and notification agents depends on core count"