Revert "slaprunner: make sure paths don't contain double slash"

This reverts commit 0b87104f.

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 72fd7bb8f9575bf1e25d13e2d910c3ea
+md5sum = 58a6f21021279ae52c91813f61cdbdd7
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -118,21 +118,21 @@ custom-frontend-url = $${custom-frontend-url-ready-promise:url}
 [directory]
 recipe = slapos.cookbook:mkdirectory
 home = $${buildout:directory}
-etc = $${:home}/etc
-var = $${:home}/var
-srv = $${:home}/srv
-bin = $${:home}/bin
-tmp = $${:home}/tmp
+etc = $${:home}/etc/
+var = $${:home}/var/
+srv = $${:home}/srv/
+bin = $${:home}/bin/
+tmp = $${:home}/tmp/
 
 sshkeys = $${:srv}/sshkeys
-services = $${:etc}/service
-scripts = $${:etc}/run
-ssh = $${:etc}/ssh
-log = $${:var}/log
-run = $${:var}/run
-backup = $${:srv}/backup
-promises = $${:etc}/promise
-test = $${:etc}/test
+services = $${:etc}/service/
+scripts = $${:etc}/run/
+ssh = $${:etc}/ssh/
+log = $${:var}/log/
+run = $${:var}/run/
+backup = $${:srv}/backup/
+promises = $${:etc}/promise/
+test = $${:etc}/test/
 nginx-data = $${:srv}/nginx
 ca-dir = $${:srv}/ssl
 project = $${:srv}/runner/project
@@ -140,8 +140,8 @@ cgi-bin = $${:srv}/cgi-bin
 
 [runnerdirectory]
 recipe = slapos.cookbook:mkdirectory
-home = $${directory:srv}/runner
-test = $${directory:srv}/test
+home = $${directory:srv}/runner/
+test = $${directory:srv}/test/
 project = $${:home}/project
 public = $${:home}/public
 software-root = {{ slapparameter_dict.get('software-root', '$${:home}/software') }}