some fixes.
Merge branch 'master' of https://github.com/mitzkia/syslog-ng-ose-testdb

Conflicts:
	python_scripts/collect_options.py