check-patch-conflicts-v10.4.x-logzio-DEV-47397-Fix-failing-tests-on-TestTemplateDefaultData

check-patch-conflicts-v10.4.x-logzio-DEV-47397-Fix-failing-tests-on-TestTemplateDefaultData #155