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

component/cloudooo/buildout.cfg

@@ -14,7 +14,7 @@ setup = ${cloudooo-repository:location}
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/cloudooo.git
 git-executable = ${git:location}/bin/git
-revision = 6997d446bf89efa4d3175c63288d5a049a8671a6
+revision = 2536160661791c7b4704f57a42fb181cb6633d7a
 
 [cloudooo]
 recipe = zc.recipe.egg

software/osie-coupler/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = 9ca5ddf6bed34861a17e3352dacc4813
+md5sum = 17549c62b5ad20cfe2520fb2ef133c22

software/osie-coupler/instance.cfg.in

@@ -39,7 +39,7 @@ configuration.opc_ua_port = 4840
 configuration.id = 0
 configuration.heart_beat = 0
 configuration.heart_beat_interval = 50
-configuration.heart_beat_id_list =
+configuration.heart_beat_id_list = ""
 configuration.network_address_url_data_type = opc.udp://224.0.0.22:4840/
 configuration.heart_beat_timeout_interval = 100
 configuration.network_interface = ""