Merge branch 'environment-filters' into shutl-master
add first_notification_delay to default service template