slaprunner: do not include user $PATH in instance

Environment of user running `slapos node instance` should not influence the
instance.

software/slaprunner/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 713db528880282d568278f09458d2aab
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 8f49df215a1596efcec94e2cca009711
+md5sum = 9811c8879a6da37486f7dcf9dc0bf0d2
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/common.cfg

@@ -145,7 +145,6 @@ filename = bashrc.in
 recipe = zc.recipe.egg
 eggs =
   ${pycurl:egg}
-  collective.recipe.environment
   collective.recipe.template
   cns.recipe.symlink
   erp5.util

software/slaprunner/instance-runner.cfg

@@ -424,7 +424,7 @@ recipe = slapos.cookbook:wrapper
 command-line = $${gunicorn:bin_gunicorn} slapos.runner.run:app -p $${gunicorn:path_pid} -b unix:$${gunicorn:socket} -e RUNNER_CONFIG=$${slaprunner:slapos.cfg} --error-logfile $${directory:log}/$${:error-log-file} --timeout 200 --threads 3 --log-level error --preload
 error-log-file = gunicorn-error.log
 wrapper-path = $${gunicorn:bin_launcher}
-environment = PATH=$${environ:PATH}:${git:location}/bin/
+environment = PATH=/usr/bin:/bin/:${git:location}/bin/
   RUNNER_CONFIG=$${slaprunner:slapos.cfg}
   LANG=en_GB.UTF-8
 
@@ -647,12 +647,9 @@ recipe = slapos.cookbook:shell
 wrapper = $${directory:bin}/bash
 shell = ${bash:location}/bin/bash
 home = $${buildout:directory}
-path = $${environ:PATH}:/usr/bin:/bin/:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${tig:location}/bin
+path = /usr/bin:/bin/:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${tig:location}/bin
 ps1 = "\\w> "
 
-[environ]
-recipe = collective.recipe.environment
-
 [prepare-software]
 recipe = slapos.cookbook:wrapper
 command-line = ${curl:location}/bin/curl -g https://[$${slaprunner:ipv6}]:$${slaprunner:runner_port}/isSRReady --max-time 1 --insecure

software/slaprunner/software.cfg

@@ -10,7 +10,6 @@ extends = common.cfg
 Flask-Auth = 0.85
 apache-libcloud = 1.2.1
 cns.recipe.symlink = 0.2.3
-collective.recipe.environment = 0.2.0
 futures = 3.0.5
 gitdb = 0.6.4
 gunicorn = 19.4.5