Fix some merge errors

A few merge errors happened during prior commits duplicating some code blocks. I reverted bugfix-change-log-ownership-after-policy-run back to a prior commit with the correct changes. This still contains all of the changes from !17 (merged), !18 (closed), and !19 (merged).

src/run-policy/run-mmpol.sh

@@ -96,10 +96,10 @@ if [[ -z "${output_log_prefix}" ]]; then
 fi
 
 # create temporary working directory for list aggregation
-tmpglobal=${outdir}/slurm-tmp-${SLURM_JOBID}
-tmpscratch=${outdir}/slurm-tmp-${SLURM_JOBID}
+tmpglobal="${outdir}/slurm-tmp-${SLURM_JOBID}"
+tmpscratch="${outdir}/slurm-tmp-${SLURM_JOBID}"
 
-nodes=`scontrol show hostnames "${SLURM_JOB_NODELIST}" | tr '\n' ',' | sed -e 's/,$//'`
+nodes=$(scontrol show hostnames "${SLURM_JOB_NODELIST}" | tr '\n' ',' | sed -e 's/,$//')
 cores="${SLURM_CPUS_PER_TASK}"
 
 DATESTR=$(date +'%Y%m%dT%H%M%S')