Merge remote-tracking branch 'upstream/master' into zope4py2

software/monitor/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 2eb5596544d9c341acf653d4f7ce2680
 
 [template-monitor-edgetest-basic]
 _update_hash_filename_ = instance-monitor-edgetest-basic.cfg.jinja2
-md5sum = 8e0c4041f680312ff054687d7f28275a
+md5sum = efc528296ddf7fade335d5f4241c1828
 
 [network-bench-cfg]
 filename = network_bench.cfg.in

software/monitor/instance-monitor-edgetest-basic.cfg.jinja2

@@ -14,7 +14,7 @@
 {%-   endif %}
 {%- endfor %}
 {%- set CHECK_DICT = {} %}
-{%- for check_name, check_definition in slapparameter_dict['check-dict'].items() %}
+{%- for check_name, check_definition in slapparameter_dict.get('check-dict', {}).items() %}
 {%-   if 'url-list' in check_definition %}
 {%-     set check = DEFAULT_DICT.copy()  %}
 {%-     set url_list = [] %}

software/monitor/software.cfg

@@ -62,7 +62,7 @@ scripts =
 
 [versions]
 
-surykatka = 0.7.1
+surykatka = 0.8.0
 
 # For surykatka 0.7.1
 click = 8.0.1