slaprunner: Get information directly from the right section

  Use  /folder/script can lead to mistakes which cause error, as
  the instance side cannot find the file. Use directly the section is better to ensure
  you get the file even after changes on common.cfg.

  Clean up location set on common.cfg, and reduce code duplication.

software/slaprunner/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 78e4c796b15a9c5b9b41c79a3c995ee7
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = a1c0f84761d90ce37aecf9745ca34493
+md5sum = 605d7821234ded60e4651fbe25a41a5a
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/common.cfg

@@ -65,6 +65,7 @@ download-only = true
 # Downloads from template directory into current directory
 < = download-only-base
 url = ${:_profile_base_location_}/template/${:filename}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template]
 < = template-base
@@ -103,35 +104,29 @@ recipe = slapos.recipe.build:download
 [template_launcher]
 < = download-base
 recipe = slapos.recipe.build:download
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template-slapos-cfg]
 < = template-download-base
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in
 
 [template-parameters]
 < = download-only-base
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template-bash-profile]
 < = template-download-base
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = bash_profile.in
 
 [template-supervisord]
 < = template-download-base
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = supervisord.conf.in
 
 [template-listener-slapgrid]
 < = template-download-base
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = listener_slapgrid.py.in
 
 [monitor-check-webrunner-internal-instance]
 < = template-download-base
-destination = ${buildout:parts-directory}/${:filename}
+destination = ${:location}/${:filename}
 filename = monitor-check-webrunner-internal-instances.py
 
 [template-resilient-software-release-information]
@@ -140,12 +135,10 @@ filename = resilient_software_release_information.py.in
 
 [template-slapuser-script]
 < = template-download-base
-destination = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos-slapuser-script.in
 
 [template-bashrc]
 < = template-download-base
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = bashrc.in
 
 [eggs]

software/slaprunner/instance-runner.cfg

@@ -827,7 +827,7 @@ mode = 0744
 ## Slapuser slapos command script
 [template-slapuser-script]
 recipe = slapos.recipe.template:jinja2
-template = ${buildout:parts-directory}/template-slapuser-script/slapos-slapuser-script.in
+template = ${template-slapuser-script:location}/${template-slapuser-script:filename}
 rendered = $${buildout:bin-directory}/slapos
 mode = 0744
 context =