cleanups after a rebase

Author: catsby

client/driver/java.go

@@ -112,6 +112,7 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 	// Get the environment variables.
 	envVars := TaskEnvironmentVariables(ctx, task)
 
+	args := []string{}
 	// Look for jvm options
 	jvm_options, ok := task.Config["jvm_options"]
 	if ok && jvm_options != "" {
@@ -120,7 +121,7 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 	}
 
 	// Build the argument list.
-	args := []string{"-jar", filepath.Join(allocdir.TaskLocal, jarName)}
+	args = append(args, "-jar", filepath.Join(allocdir.TaskLocal, jarName))
 	if argRaw, ok := task.Config["args"]; ok {
 		args = append(args, argRaw)
 	}