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-submit-pol-job.py

@@ -106,11 +106,8 @@ def validate_output_directory(outdir):
     return p
 
 def create_default_log_prefix(device):
-    if device.match('/data/user'):
-        log_prefix = 'list-policy_data_user'
-    else:
-        log_prefix = f'list-policy_{device.stem}'
-    return log_prefix
+    mod_device = str(device).strip('/').replace('/','-')
+    return f"list-policy_{mod_device}"
 
 def main():
     args = parse_args()