Merge rev 37886 from 3.4 branch.

[Martijn Pieters]
Include INSTANCE_HOME in the runzeo and zeoctl startup scripts from
the get-go; this helps poor schmucks like me who have to make
app-level conflict resolution work in Products as well. Including
INSTANCE_HOME makes sure ZEO can find the product code in the first
place.

src/scripts/mkzeoinst.py

@@ -95,12 +95,13 @@ zeoctl_template = """\
 # description: start a %(PACKAGE)s server
 
 PYTHON="%(python)s"
+INSTANCE_HOME="%(instance_home)s"
 ZODB3_HOME="%(zodb3_home)s"
 
 CONFIG_FILE="%(instance_home)s/etc/%(package)s.conf"
 
 PYTHONPATH="$ZODB3_HOME"
-export PYTHONPATH
+export PYTHONPATH INSTANCE_HOME
 
 ZEOCTL="$ZODB3_HOME/ZEO/zeoctl.py"
 
@@ -112,12 +113,13 @@ runzeo_template = """\
 # %(PACKAGE)s instance start script
 
 PYTHON="%(python)s"
+INSTANCE_HOME="%(instance_home)s"
 ZODB3_HOME="%(zodb3_home)s"
 
 CONFIG_FILE="%(instance_home)s/etc/%(package)s.conf"
 
 PYTHONPATH="$ZODB3_HOME"
-export PYTHONPATH
+export PYTHONPATH INSTANCE_HOME
 
 RUNZEO="$ZODB3_HOME/ZEO/runzeo.py"