Improved handling of CTRL+C (SIGINT) to terminate long runnining tasks (e.g.  inventory of SNMP hosts)
Added fileinfo to the solaris Agent. Thanks to Daniel Roettgermann
fixed merge conflict