Merge remote branch 'origin/master' into momo

* origin/master: (28 commits)
  Need to run install during prepare, or else the release:perform fails miserably.
  Enabled more convenient access to the XSTREAM field
  added a method to help plugins rename classes and still keep backward compatibility
  Rely on released versions
  Test files accidentally crept in.
  modified to use the type-safe tag lib interface.
  Hooking the taglib interface generation.
  [JENKINS-9326] add integration tests with eclipse tycho relocation
  experimenting with the taglib interface generator
  fixed NPE
  Converted a few more pages into Groovy to test the behaviour. Allow global.jelly to be written in Groovy.
  Jenkins
  auto-completes instance and descriptor
  Support global.groovy as well as config.groovy
  A few more Jelly files switched to Groovy as a test
  Looks like a dead code.
  added DSLD for Eclipse
  1.166 shipped
  not specifying the file extension so that different pieces can be implemented by different view technologies
  replaced i18n by '_' since it shows up a lot.
  ...

Conflicts:
	core/src/main/java/hudson/model/Hudson.java

core/src/main/java/hudson/WebAppMain.java

@@ -222,20 +222,20 @@ public final class WebAppMain implements ServletContextListener {
                             }
                         }, 1000*10);
                     } catch (Error e) {
-                        LOGGER.log(Level.SEVERE, "Failed to initialize Hudson",e);
+                        LOGGER.log(Level.SEVERE, "Failed to initialize Jenkins",e);
                         context.setAttribute(APP,new HudsonFailedToLoad(e));
                         throw e;
                     } catch (Exception e) {
-                        LOGGER.log(Level.SEVERE, "Failed to initialize Hudson",e);
+                        LOGGER.log(Level.SEVERE, "Failed to initialize Jenkins",e);
                         context.setAttribute(APP,new HudsonFailedToLoad(e));
                     }
                 }
             }.start();
         } catch (Error e) {
-            LOGGER.log(Level.SEVERE, "Failed to initialize Hudson",e);
+            LOGGER.log(Level.SEVERE, "Failed to initialize Jenkins",e);
             throw e;
         } catch (RuntimeException e) {
-            LOGGER.log(Level.SEVERE, "Failed to initialize Hudson",e);
+            LOGGER.log(Level.SEVERE, "Failed to initialize Jenkins",e);
             throw e;
         }
     }