Introduce a single collector which restricts collection
Merge remote-tracking branch 'origin/kti' into kti

Conflicts:
	RiskAnalyticsPcCashflowGrailsPlugin.groovy
Introduce a single collector which restricts collection