test
Merge remote-tracking branch 'origin/kakai' into kakai
test
rabbitmq
collectortemplate
filtertemplate using rabbitmq_fallback