release 5
Merge branch 'master' into add-logstash_forwarder
support for job/global logstash forwarding