Merge remote-tracking branch 'remotes/origin/dev' into issue/1093

setup/so-functions

@@ -1245,7 +1245,10 @@ manager_global() {
 		"  time_file: 1"\
 		"  upload_queue_size: 4"\
 		"  encoding: gzip"\
-		"  interval: 5" >> "$global_pillar"
+		"  interval: 5"\
+	        "backup:"\
+                "  locations:"\
+                "    - /opt/so/saltstack/local" >> "$global_pillar"
 		
 	printf '%s\n'  '----' >> "$setup_log" 2>&1
 }

setup/so-setup

@@ -461,6 +461,7 @@ fi
 {
 	# Set initial percentage to 0
 	export percentage=0
+	set_path
 
     if [[ $is_manager && $is_airgap ]]; then
 	    info "Creating airgap repo"