Imorived zabbix template creation.
Improved upload to cloud handling for systems not propperly deployed.
Merge branch 'test' into dev