Adding sha1 password encryption support for htpasswd file (authentication for nagios). Use sha_raw mode for this.

Conflicts:

	CHANGELOG
post-merge cleanup
added logmessage when a TRAP service or advanced-service is removed from collector config
changed pattern used to parse for SNMP TRAP services within the collector configuration

Conflicts:

	CHANGELOG