Add regex result on software in collect rules. closes #2698

Conflicts:
	inc/collectrule.class.php