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

software/osie-coupler/software-dev.cfg

+# most recent version of OSIE coupler
+[buildout]
+extends = software.cfg
+
+[osie-repository]
+revision =

software/osie-coupler/software.cfg

@@ -44,11 +44,11 @@ environment +=
 recipe  = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
 repository = https://lab.nexedi.com/nexedi/osie.git
-revision = 35228392c4f2eb24eee478cd98349e0f613a4ff2
+revision = dc273b64b594de90080afdef873403f953c989f5
 
 [compile-coupler]
 recipe = slapos.recipe.cmmi
-path = ${osie-repository:location}/coupler/opc-ua-server/
+path = ${osie-repository:location}/coupler/
 bin_dir = ${:path}/bin/
 environment =
   OPEN62541_HOME = ${open62541:location}