Merge branch 'master' of git.tcpcloud.eu:saltstack-formulas/heka-formula