Improved handlign of packaged files included zabbix_template.
Merge branch 'test' into dev