Merge branch 'dev' (added dirty workaround to kill scripts when stopping/restarting Splunk + minor improvements)