Merge pull request #3017 from cmaglie/programmer-pref-override

programmer.txt definitions must have priority over platforms.txt tools definitions

Author: ffissore

arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -253,8 +253,8 @@ public boolean uploadUsingProgrammer(String buildPath, String className) throws
     if (programmerPrefs == null)
       throw new RunnerException(
           _("Please select a programmer from Tools->Programmer menu"));
+    prefs.putAll(targetPlatform.getTool(programmerPrefs.getOrExcept("program.tool")));
     prefs.putAll(programmerPrefs);
-    prefs.putAll(targetPlatform.getTool(prefs.getOrExcept("program.tool")));
 
     prefs.put("build.path", buildPath);
     prefs.put("build.project_name", className);