Piece-meal merging pull request #42

* commit 'b7a6c5d5':
  Reverting the BUIlD_TAG change.
  Fixed BUILD_TAG env var to not say hudson and added JENKINS_* versions of more env vars.

Conflicts:
	changelog.html

core/src/main/java/hudson/model/Run.java

@@ -1766,7 +1766,8 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
             env = c.getEnvironment().overrideAll(env);
         String rootUrl = Hudson.getInstance().getRootUrl();
         if(rootUrl!=null) {
-            env.put("HUDSON_URL", rootUrl);
+            env.put("JENKINS_URL", rootUrl);
+            env.put("HUDSON_URL", rootUrl); // Legacy compatibility
             env.put("BUILD_URL", rootUrl+getUrl());
             env.put("JOB_URL", rootUrl+getParent().getUrl());
         }
@@ -1796,7 +1797,8 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
      */
     public final EnvVars getCharacteristicEnvVars() {
         EnvVars env = new EnvVars();
-        env.put("HUDSON_SERVER_COOKIE",Util.getDigestOf("ServerID:"+Hudson.getInstance().getSecretKey()));
+        env.put("JENKINS_SERVER_COOKIE",Util.getDigestOf("ServerID:"+Hudson.getInstance().getSecretKey()));
+        env.put("HUDSON_SERVER_COOKIE",Util.getDigestOf("ServerID:"+Hudson.getInstance().getSecretKey())); // Legacy compatibility
         env.put("BUILD_NUMBER",String.valueOf(number));
         env.put("BUILD_ID",getId());
         env.put("BUILD_TAG","hudson-"+getParent().getName()+"-"+number);