allow retry and first_notification_delay in service templates
Merge branch 'service-template-directives' into shutl-master