LILY-411: Replace existing email template when selecting a new one
Merge branch 'feature/LILY-411-replaceable-email-templates' into develop
Fix filterquery not working when q is set for ElasticSearch
fix after Bob splitting of search view into util view
2/2 fix after Bob splitting of search view into util view
add cluster.name parameter
cleanup tests
temp commit
cleanup more tests
Update