diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..e111ea504a
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,191 @@
+#!groovy
+/*
+ * This Jenkinsfile is intended to run on https://ci.jenkins-ci.org and may fail anywhere else.
+ * It makes assumptions about plugins being installed, labels mapping to nodes that can build what is needed, etc.
+ *
+ * The required labels are "java" and "docker" - "java" would be any node that can run Java builds. It doesn't need
+ * to have Java installed, but some setups may have nodes that shouldn't have heavier builds running on them, so we
+ * make this explicit. "docker" would be any node with docker installed.
+ */
+
+// TEST FLAG - to make it easier to turn on/off unit tests for speeding up access to later stuff.
+def runTests = true
+
+// Only keep the 10 most recent builds.
+properties([[$class: 'jenkins.model.BuildDiscarderProperty', strategy: [$class: 'LogRotator',
+                                                                        numToKeepStr: '50',
+                                                                        artifactNumToKeepStr: '20']]])
+
+String packagingBranch = (binding.hasVariable('packagingBranch')) ? packagingBranch : 'master'
+
+timestampedNode('java') {
+
+    // First stage is actually checking out the source. Since we're using Multibranch
+    // currently, we can use "checkout scm".
+    stage "Checkout source"
+
+    checkout scm
+
+    // Now run the actual build.
+    stage "Build and test"
+
+    // We're wrapping this in a timeout - if it takes more than 180 minutes, kill it.
+    timeout(time: 180, unit: 'MINUTES') {
+        // See below for what this method does - we're passing an arbitrary environment
+        // variable to it so that JAVA_OPTS and MAVEN_OPTS are set correctly.
+        withMavenEnv(["JAVA_OPTS=-Xmx1536m -Xms512m -XX:MaxPermSize=1024m",
+                      "MAVEN_OPTS=-Xmx1536m -Xms512m -XX:MaxPermSize=1024m"]) {
+            // Actually run Maven!
+            // The -Dmaven.repo.local=${pwd()}/.repository means that Maven will create a
+            // .repository directory at the root of the build (which it gets from the
+            // pwd() Workflow call) and use that for the local Maven repository.
+            sh "mvn -Pdebug -U clean install ${runTests ? '-Dmaven.test.failure.ignore=true -Dconcurrency=1' : '-DskipTests'} -V -B -Dmaven.repo.local=${pwd()}/.repository"
+        }
+    }
+
+    // Once we've built, archive the artifacts and the test results.
+    stage "Archive artifacts and test results"
+
+    step([$class: 'ArtifactArchiver', artifacts: '**/target/*.jar, **/target/*.war, **/target/*.hpi', fingerprint: true])
+    if (runTests) {
+        step([$class: 'JUnitResultArchiver', healthScaleFactor: 20.0, testResults: '**/target/surefire-reports/*.xml'])
+    }
+}
+
+def debFileName
+def rpmFileName
+def suseFileName
+
+// Run the packaging build on a node with the "docker" label.
+timestampedNode('docker') {
+    // First stage here is getting prepped for packaging.
+    stage "packaging - docker prep"
+
+    // Docker environment to build packagings
+    dir('packaging-docker') {
+        git branch: packagingBranch, url: 'https://github.com/jenkinsci/packaging.git'
+        sh 'docker build -t jenkins-packaging-builder:0.1 docker'
+    }
+
+    stage "packaging - actually packaging"
+    // Working packaging code, separate branch with fixes
+    dir('packaging') {
+        deleteDir()
+
+        docker.image("jenkins-packaging-builder:0.1").inside("-u root") {
+            git branch: packagingBranch, url: 'https://github.com/jenkinsci/packaging.git'
+
+            try {
+                // Saw issues with unstashing inside a container, and not sure copy artifact plugin would work here.
+                // So, simple wget.
+                sh "wget -q ${currentBuild.absoluteUrl}/artifact/war/target/jenkins.war"
+                sh "make clean deb rpm suse BRAND=./branding/jenkins.mk BUILDENV=./env/test.mk CREDENTIAL=./credentials/test.mk WAR=jenkins.war"
+            } catch (Exception e) {
+                error "Packaging failed: ${e}"
+            } finally {
+                // Needed to make sure the output of the build can be deleted by later runs.
+                // Hackish, yes, but rpm builds as a numeric UID only user fail, so...
+                sh "chmod -R a+w target || true"
+                sh "chmod a+w jenkins.war || true"
+            }
+            dir("target/debian") {
+                def debFilesFound = findFiles(glob: "*.deb")
+                if (debFilesFound.size() > 0) {
+                    debFileName = debFilesFound[0]?.name
+                }
+            }
+
+            dir("target/rpm") {
+                def rpmFilesFound = findFiles(glob: "*.rpm")
+                if (rpmFilesFound.size() > 0) {
+                    rpmFileName = rpmFilesFound[0]?.name
+                }
+            }
+
+            dir("target/suse") {
+                def suseFilesFound = findFiles(glob: "*.rpm")
+                if (suseFilesFound.size() > 0) {
+                    suseFileName = suseFilesFound[0]?.name
+                }
+            }
+
+            step([$class: 'ArtifactArchiver', artifacts: 'target/**/*', fingerprint: true])
+
+            // Fail the build if we didn't find at least one of the packages, meaning they weren't built but
+            // somehow make didn't error out.
+            if (debFileName == null || rpmFileName == null || suseFileName  == null) {
+                error "At least one of Debian, RPM or SuSE packages are missing, so failing the build."
+            }
+        }
+
+    }
+
+}
+
+stage "Package testing"
+
+if (runTests) {
+    if (!env.BRANCH_NAME.startsWith("PR")) {
+        // NOTE: As of now, a lot of package tests will fail. See https://issues.jenkins-ci.org/issues/?filter=15257 for
+        // possible open JIRAs.
+
+        // Basic parameters
+        String artifactName = (binding.hasVariable('artifactName')) ? artifactName : 'jenkins'
+        String jenkinsPort = (binding.hasVariable('jenkinsPort')) ? jenkinsPort : '8080'
+
+        // Set up
+        String debfile = "artifact://${env.JOB_NAME}/${env.BUILD_NUMBER}#target/debian/${debFileName}"
+        String rpmfile = "artifact://${env.JOB_NAME}/${env.BUILD_NUMBER}#target/rpm/${rpmFileName}"
+        String susefile = "artifact://${env.JOB_NAME}/${env.BUILD_NUMBER}#target/suse/${suseFileName}"
+
+        timestampedNode("docker") {
+            stage "Load Lib"
+            dir('workflowlib') {
+                deleteDir()
+                git branch: packagingBranch, url: 'https://github.com/jenkinsci/packaging.git'
+                flow = load 'workflow/installertest.groovy'
+            }
+        }
+        // Run the real tests within docker node label
+        flow.fetchAndRunJenkinsInstallerTest("docker", rpmfile, susefile, debfile,
+            packagingBranch, artifactName, jenkinsPort)
+    } else {
+        echo "Not running package testing against pull requests"
+    }
+} else {
+    echo "Skipping package tests"
+}
+
+
+// This method sets up the Maven and JDK tools, puts them in the environment along
+// with whatever other arbitrary environment variables we passed in, and runs the
+// body we passed in within that environment.
+void withMavenEnv(List envVars = [], def body) {
+    // The names here are currently hardcoded for my test environment. This needs
+    // to be made more flexible.
+    // Using the "tool" Workflow call automatically installs those tools on the
+    // node.
+    String mvntool = tool name: "mvn3.3.3", type: 'hudson.tasks.Maven$MavenInstallation'
+    String jdktool = tool name: "jdk8_51", type: 'hudson.model.JDK'
+
+    // Set JAVA_HOME, MAVEN_HOME and special PATH variables for the tools we're
+    // using.
+    List mvnEnv = ["PATH+MVN=${mvntool}/bin", "PATH+JDK=${jdktool}/bin", "JAVA_HOME=${jdktool}", "MAVEN_HOME=${mvntool}"]
+
+    // Add any additional environment variables.
+    mvnEnv.addAll(envVars)
+
+    // Invoke the body closure we're passed within the environment we've created.
+    withEnv(mvnEnv) {
+        body.call()
+    }
+}
+
+// Runs the given body within a Timestamper wrapper on the given label.
+def timestampedNode(String label, Closure body) {
+    node(label) {
+        wrap([$class: 'TimestamperBuildWrapper']) {
+            body.call()
+        }
+    }
+}
diff --git a/changelog.html b/changelog.html
index 910693ef0b..a88d49efae 100644
--- a/changelog.html
+++ b/changelog.html
@@ -56,10 +56,7 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class="major RFE">
-    Plugin dependencies are now strictly enforced during Jenkins startup, to avoid cryptic errors later.
-    You may use <code>-Dhudson.PluginWrapper.dependenciesVersionCheck.enabled=false</code> to revert to the old behavior.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21486">issue 21486</a>)
+  <li class=>
 </ul>
 </div><!--=TRUNK-END=-->
 <h3><a name=v1.656>What's new in 1.656</a> (2016/04/03)</h3>
diff --git a/cli/pom.xml b/cli/pom.xml
index 0413c5811f..05a84a23cb 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.657-SNAPSHOT</version>
+    <version>2.0-rc-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 94ea432187..4f2c0216ff 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.657-SNAPSHOT</version>
+    <version>2.0-rc-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
@@ -41,7 +41,7 @@ THE SOFTWARE.
     <staplerFork>true</staplerFork>
     <stapler.version>1.239</stapler.version>
     <spring.version>2.5.6.SEC03</spring.version>
-    <groovy.version>1.8.9</groovy.version>
+    <groovy.version>2.4.6</groovy.version>
   </properties>
 
   <dependencies>
@@ -243,8 +243,8 @@ THE SOFTWARE.
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -411,13 +411,13 @@ THE SOFTWARE.
     <dependency><!-- groovy shell uses this but uses an optional dependency -->
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
-      <version>1.0</version>
+      <version>2.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency><!-- groovy shell uses this but it doesn't declare this dependency -->
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi</artifactId>
-      <version>1.9</version>
+      <version>1.11</version>
     </dependency>
     <dependency>
       <!--
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index d644d95409..6903addc10 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -65,6 +65,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.Vector;
@@ -74,6 +75,10 @@ import java.util.jar.Manifest;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.jenkinsci.bytecode.Transformer;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+import javax.annotation.Nonnull;
 
 import static org.apache.commons.io.FilenameUtils.getBaseName;
 
@@ -236,8 +241,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
                 }
             }
         }
-        for (DetachedPlugin detached : DETACHED_LIST)
-            detached.fix(atts,optionalDependencies);
+        
+        fix(atts,optionalDependencies);
 
         // Register global classpath mask. This is useful for hiding JavaEE APIs that you might see from the container,
         // such as database plugin for JPA support. The Mask-Classes attribute is insufficient because those classes
@@ -255,6 +260,41 @@ public class ClassicPluginStrategy implements PluginStrategy {
                 createClassLoader(paths, dependencyLoader, atts), disableFile, dependencies, optionalDependencies);
     }
 
+    private static void fix(Attributes atts, List<PluginWrapper.Dependency> optionalDependencies) {
+        String pluginName = atts.getValue("Short-Name");
+        
+        String jenkinsVersion = atts.getValue("Jenkins-Version");
+        if (jenkinsVersion==null)
+            jenkinsVersion = atts.getValue("Hudson-Version");
+        
+        optionalDependencies.addAll(getImpliedDependencies(pluginName, jenkinsVersion));
+    }
+    
+    /**
+     * Returns all the plugin dependencies that are implicit based on a particular Jenkins version
+     * @since 2.0
+     */
+    @Nonnull
+    public static List<PluginWrapper.Dependency> getImpliedDependencies(String pluginName, String jenkinsVersion) {
+        List<PluginWrapper.Dependency> out = new ArrayList<>();
+        for (DetachedPlugin detached : DETACHED_LIST) {
+            // don't fix the dependency for itself, or else we'll have a cycle
+            if (detached.shortName.equals(pluginName)) {
+                continue;
+            }
+            if (BREAK_CYCLES.contains(pluginName + '/' + detached.shortName)) {
+                LOGGER.log(Level.FINE, "skipping implicit dependency {0} → {1}", new Object[] {pluginName, detached.shortName});
+                continue;
+            }
+            // some earlier versions of maven-hpi-plugin apparently puts "null" as a literal in Hudson-Version. watch out for them.
+            if (jenkinsVersion == null || jenkinsVersion.equals("null") || new VersionNumber(jenkinsVersion).compareTo(detached.splitWhen) <= 0) {
+                out.add(new PluginWrapper.Dependency(detached.shortName + ':' + detached.requireVersion));
+                LOGGER.log(Level.FINE, "adding implicit dependency {0} → {1} because of {2}", new Object[] {pluginName, detached.shortName, jenkinsVersion});
+            }
+        }
+        return out;
+    }
+
     @Deprecated
     protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent) throws IOException {
         return createClassLoader( paths, parent, null );
@@ -281,9 +321,65 @@ public class ClassicPluginStrategy implements PluginStrategy {
     }
 
     /**
-     * Information about plugins that were originally in the core.
+     * Get the list of all plugins that have ever been {@link DetachedPlugin detached} from Jenkins core.
+     * @return A {@link List} of {@link DetachedPlugin}s.
      */
-    private static final class DetachedPlugin {
+    @Restricted(NoExternalUse.class)
+    public static @Nonnull List<DetachedPlugin> getDetachedPlugins() {
+        return DETACHED_LIST;
+    }
+
+    /**
+     * Get the list of plugins that have been detached since a specific Jenkins release version.
+     * @param since The Jenkins version.
+     * @return A {@link List} of {@link DetachedPlugin}s.
+     */
+    @Restricted(NoExternalUse.class)
+    public static @Nonnull List<DetachedPlugin> getDetachedPlugins(@Nonnull VersionNumber since) {
+        List<DetachedPlugin> detachedPlugins = new ArrayList<>();
+
+        for (DetachedPlugin detachedPlugin : DETACHED_LIST) {
+            if (!detachedPlugin.getSplitWhen().isOlderThan(since)) {
+                detachedPlugins.add(detachedPlugin);
+            }
+        }
+
+        return detachedPlugins;
+    }
+
+    /**
+     * Is the named plugin a plugin that was detached from Jenkins at some point in the past.
+     * @param pluginId The plugin ID.
+     * @return {@code true} if the plugin is a plugin that was detached from Jenkins at some
+     * point in the past, otherwise {@code false}.
+     */
+    @Restricted(NoExternalUse.class)
+    public static boolean isDetachedPlugin(@Nonnull String pluginId) {
+        for (DetachedPlugin detachedPlugin : DETACHED_LIST) {
+            if (detachedPlugin.getShortName().equals(pluginId)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Information about plugins that were originally in the core.
+     * <p>
+     * A detached plugin is one that has any of the following characteristics:
+     * <ul>
+     *     <li>
+     *         Was an existing plugin that at some time previously bundled with the Jenkins war file.
+     *     </li>
+     *     <li>
+     *         Was previous code in jenkins core that was split to a separate-plugin (but may not have
+     *         ever been bundled in a jenkins war file - i.e. it gets split after this 2.0 update).
+     *     </li>
+     * </ul>
+     */
+    @Restricted(NoExternalUse.class)
+    public static final class DetachedPlugin {
         private final String shortName;
         /**
          * Plugins built for this Jenkins version (and earlier) will automatically be assumed to have
@@ -301,42 +397,39 @@ public class ClassicPluginStrategy implements PluginStrategy {
             this.requireVersion = requireVersion;
         }
 
-        private void fix(Attributes atts, List<PluginWrapper.Dependency> optionalDependencies) {
-            // don't fix the dependency for yourself, or else we'll have a cycle
-            String yourName = atts.getValue("Short-Name");
-            if (shortName.equals(yourName))   return;
-            if (BREAK_CYCLES.contains(yourName + '/' + shortName)) {
-                LOGGER.log(Level.FINE, "skipping implicit dependency {0} → {1}", new Object[] {yourName, shortName});
-                return;
-            }
+        /**
+         * Get the short name of the plugin.
+         * @return The short name of the plugin.
+         */
+        public String getShortName() {
+            return shortName;
+        }
 
-            // some earlier versions of maven-hpi-plugin apparently puts "null" as a literal in Hudson-Version. watch out for them.
-            String jenkinsVersion = atts.getValue("Jenkins-Version");
-            if (jenkinsVersion==null)
-                jenkinsVersion = atts.getValue("Hudson-Version");
-            if (jenkinsVersion == null || jenkinsVersion.equals("null") || new VersionNumber(jenkinsVersion).compareTo(splitWhen) <= 0) {
-                optionalDependencies.add(new PluginWrapper.Dependency(shortName + ':' + requireVersion));
-                LOGGER.log(Level.FINE, "adding implicit dependency {0} → {1} because of {2}", new Object[] {yourName, shortName, jenkinsVersion});
-            }
+        /**
+         * Get the Jenkins version from which the plugin was detached.
+         * @return The Jenkins version from which the plugin was detached.
+         */
+        public VersionNumber getSplitWhen() {
+            return splitWhen;
         }
     }
 
-    private static final List<DetachedPlugin> DETACHED_LIST = Arrays.asList(
-        new DetachedPlugin("maven-plugin","1.296","1.296"),
-        new DetachedPlugin("subversion","1.310","1.0"),
-        new DetachedPlugin("cvs","1.340","0.1"),
-        new DetachedPlugin("ant","1.430.*","1.0"),
-        new DetachedPlugin("javadoc","1.430.*","1.0"),
-        new DetachedPlugin("external-monitor-job","1.467.*","1.0"),
-        new DetachedPlugin("ldap","1.467.*","1.0"),
-        new DetachedPlugin("pam-auth","1.467.*","1.0"),
-        new DetachedPlugin("mailer","1.493.*","1.2"),
-        new DetachedPlugin("matrix-auth","1.535.*","1.0.2"),
-        new DetachedPlugin("windows-slaves","1.547.*","1.0"),
-        new DetachedPlugin("antisamy-markup-formatter","1.553.*","1.0"),
-        new DetachedPlugin("matrix-project","1.561.*","1.0"),
-        new DetachedPlugin("junit","1.577.*","1.0")
-    );
+    private static final List<DetachedPlugin> DETACHED_LIST = Collections.unmodifiableList(Arrays.asList(
+            new DetachedPlugin("maven-plugin", "1.296", "1.296"),
+            new DetachedPlugin("subversion", "1.310", "1.0"),
+            new DetachedPlugin("cvs", "1.340", "0.1"),
+            new DetachedPlugin("ant", "1.430.*", "1.0"),
+            new DetachedPlugin("javadoc", "1.430.*", "1.0"),
+            new DetachedPlugin("external-monitor-job", "1.467.*", "1.0"),
+            new DetachedPlugin("ldap", "1.467.*", "1.0"),
+            new DetachedPlugin("pam-auth", "1.467.*", "1.0"),
+            new DetachedPlugin("mailer", "1.493.*", "1.2"),
+            new DetachedPlugin("matrix-auth", "1.535.*", "1.0.2"),
+            new DetachedPlugin("windows-slaves", "1.547.*", "1.0"),
+            new DetachedPlugin("antisamy-markup-formatter", "1.553.*", "1.0"),
+            new DetachedPlugin("matrix-project", "1.561.*", "1.0"),
+            new DetachedPlugin("junit", "1.577.*", "1.0")
+    ));
 
     /** Implicit dependencies that are known to be unnecessary and which must be cut out to prevent a dependency cycle among bundled plugins. */
     private static final Set<String> BREAK_CYCLES = new HashSet<String>(Arrays.asList(
diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java
index c0047b5578..5cdc672bf4 100644
--- a/core/src/main/java/hudson/EnvVars.java
+++ b/core/src/main/java/hudson/EnvVars.java
@@ -63,7 +63,7 @@ import java.util.logging.Logger;
  *
  * <p>
  * In Jenkins, often we need to build up "environment variable overrides"
- * on master, then to execute the process on slaves. This causes a problem
+ * on master, then to execute the process on agents. This causes a problem
  * when working with variables like <tt>PATH</tt>. So to make this work,
  * we introduce a special convention <tt>PATH+FOO</tt> &mdash; all entries
  * that starts with <tt>PATH+</tt> are merged and prepended to the inherited
@@ -134,7 +134,7 @@ public class EnvVars extends TreeMap<String,String> {
             String v = get(realKey);
             if(v==null) v=value;
             else {
-                // we might be handling environment variables for a slave that can have different path separator
+                // we might be handling environment variables for a agent that can have different path separator
                 // than the master, so the following is an attempt to get it right.
                 // it's still more error prone that I'd like.
                 char ch = platform==null ? File.pathSeparatorChar : platform.pathSeparator;
@@ -421,8 +421,8 @@ public class EnvVars extends TreeMap<String,String> {
      * variables only when you access this from the master.
      *
      * <p>
-     * If you access this field from slaves, then this is the environment
-     * variable of the slave agent.
+     * If you access this field from agents, then this is the environment
+     * variable of the agent agent.
      */
     public static final Map<String,String> masterEnvVars = initMaster();
 
diff --git a/core/src/main/java/hudson/ExtensionFinder.java b/core/src/main/java/hudson/ExtensionFinder.java
index 1647abce6f..68f1b9a180 100644
--- a/core/src/main/java/hudson/ExtensionFinder.java
+++ b/core/src/main/java/hudson/ExtensionFinder.java
@@ -496,10 +496,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
             @SuppressWarnings({"unchecked", "ChainOfInstanceofChecks"})
             @Override
             protected void configure() {
-                int id=0;
-
                 for (final IndexItem<?,Object> item : index) {
-                    id++;
                     boolean optional = isOptional(item.annotation());
                     try {
                         AnnotatedElement e = item.element();
@@ -524,8 +521,8 @@ public abstract class ExtensionFinder implements ExtensionPoint {
 
                             resolve(extType);
 
-                            // use arbitrary id to make unique key, because Guice wants that.
-                            Key key = Key.get(extType, Names.named(String.valueOf(id)));
+                            // make unique key, because Guice wants that.
+                            Key key = Key.get(extType, Names.named(item.className() + "." + item.memberName()));
                             annotations.put(key,a);
                             bind(key).toProvider(new Provider() {
                                     public Object get() {
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index ec13085817..72383256e4 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -127,7 +127,7 @@ import org.jenkinsci.remoting.RoleSensitive;
  *
  * <p>
  * Unlike {@link File}, which always implies a file path on the current computer,
- * {@link FilePath} represents a file path on a specific slave or the master.
+ * {@link FilePath} represents a file path on a specific agent or the master.
  *
  * Despite that, {@link FilePath} can be used much like {@link File}. It exposes
  * a bunch of operations (and we should add more operations as long as they are
@@ -191,19 +191,19 @@ public final class FilePath implements Serializable {
     /**
      * When this {@link FilePath} represents the remote path,
      * this field is always non-null on master (the field represents
-     * the channel to the remote slave.) When transferred to a slave via remoting,
+     * the channel to the remote agent.) When transferred to a agent via remoting,
      * this field reverts back to null, since it's transient.
      *
      * When this {@link FilePath} represents a path on the master,
-     * this field is null on master. When transferred to a slave via remoting,
+     * this field is null on master. When transferred to a agent via remoting,
      * this field becomes non-null, representing the {@link Channel}
      * back to the master.
      *
-     * This is used to determine whether we are running on the master or the slave.
+     * This is used to determine whether we are running on the master or the agent.
      */
     private transient VirtualChannel channel;
 
-    // since the platform of the slave might be different, can't use java.io.File
+    // since the platform of the agent might be different, can't use java.io.File
     private final String remote;
 
     /**
@@ -259,7 +259,7 @@ public final class FilePath implements Serializable {
             return base.remote+'/'+rel.replace('\\','/');
         } else {
             // need this replace, see Slave.getWorkspaceFor and AbstractItem.getFullName, nested jobs on Windows
-            // slaves will always have a rel containing at least one '/' character. JENKINS-13649
+            // agents will always have a rel containing at least one '/' character. JENKINS-13649
             return base.remote+'\\'+rel.replace('/','\\');
         }
     }
@@ -802,14 +802,14 @@ public final class FilePath implements Serializable {
                 listener.getLogger().println(message);
 
             if (isRemote()) {
-                // First try to download from the slave machine.
+                // First try to download from the agent machine.
                 try {
                     act(new Unpack(archive));
                     timestamp.touch(sourceTimestamp);
                     return true;
                 } catch (IOException x) {
                     if (listener != null) {
-                        x.printStackTrace(listener.error("Failed to download " + archive + " from slave; will retry from master"));
+                        x.printStackTrace(listener.error("Failed to download " + archive + " from agent; will retry from master"));
                     }
                 }
             }
diff --git a/core/src/main/java/hudson/FileSystemProvisioner.java b/core/src/main/java/hudson/FileSystemProvisioner.java
index bbb98f5e9d..cd8a568869 100644
--- a/core/src/main/java/hudson/FileSystemProvisioner.java
+++ b/core/src/main/java/hudson/FileSystemProvisioner.java
@@ -51,7 +51,7 @@ import java.io.OutputStream;
  * STILL A WORK IN PROGRESS. SUBJECT TO CHANGE! DO NOT EXTEND.
  *
  * TODO: is this per {@link Computer}? Per {@link Job}?
- *   -> probably per slave.
+ *   -> probably per agent.
  *
  * <h2>Design Problems</h2>
  * <ol>
@@ -71,7 +71,7 @@ import java.io.OutputStream;
  * one more configuration option. It's especially tricky because
  * during the configuration we don't know the OS type.
  *
- * OTOH special slave type like the ones for network.com grid can
+ * OTOH special agent type like the ones for network.com grid can
  * hide this.
  * </ol>
  *
@@ -80,8 +80,8 @@ import java.io.OutputStream;
  *
  * To recap,
  *
- * - when a slave connects, we auto-detect the file system provisioner.
- *   (for example, ZFS FSP would check the slave root user prop
+ * - when an agent connects, we auto-detect the file system provisioner.
+ *   (for example, ZFS FSP would check the agent root user prop
  *   and/or attempt to "pfexec zfs create" and take over.)
  *
  * - the user may configure jobs for snapshot collection, along with
diff --git a/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java b/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java
index 4827366d36..ce0371ceec 100644
--- a/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java
+++ b/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java
@@ -38,9 +38,9 @@ public abstract class FileSystemProvisionerDescriptor extends Descriptor<FileSys
      * Called to clean up a workspace that may potentially belong to this {@link FileSystemProvisioner}.
      *
      * <p>
-     * Because users may modify the file system behind Hudson, and slaves may come and go when
+     * Because users may modify the file system behind Hudson, and agents may come and go when
      * configuration changes happen, in general case Hudson is unable to keep track of which jobs
-     * have workspaces in which slaves.
+     * have workspaces in which agents.
      *
      * <p>
      * So instead we rey on a garbage collection mechanism, to look at workspaces left in the file system
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 9e87991574..3008814c48 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -130,7 +130,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.GlobalConfigurationCategory;
-import jenkins.model.GlobalConfigurationCategory.Unclassified;
 import jenkins.model.Jenkins;
 import jenkins.model.ModelObjectWithChildren;
 import jenkins.model.ModelObjectWithContextMenu;
@@ -965,12 +964,8 @@ public class Functions {
             Descriptor d = c.getInstance();
             if (d.getGlobalConfigPage()==null)  continue;
 
-            if (d instanceof GlobalConfiguration) {
-                if (predicate.apply(((GlobalConfiguration)d).getCategory()))
-                    r.add(new Tag(c.ordinal(), d));
-            } else {
-                if (predicate.apply(GlobalConfigurationCategory.get(Unclassified.class)))
-                    r.add(new Tag(0, d));
+            if (predicate.apply(d.getCategory())) {
+                r.add(new Tag(c.ordinal(), d));
             }
         }
         Collections.sort(r);
@@ -1585,7 +1580,7 @@ public class Functions {
      * Obtains the host name of the Hudson server that clients can use to talk back to.
      * <p>
      * This is primarily used in <tt>slave-agent.jnlp.jelly</tt> to specify the destination
-     * that the slaves talk to.
+     * that the agents talk to.
      */
     public String getServerName() {
         // Try to infer this from the configured root URL.
diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java
index 5be9397699..fbdb0609c7 100644
--- a/core/src/main/java/hudson/Launcher.java
+++ b/core/src/main/java/hudson/Launcher.java
@@ -297,7 +297,7 @@ public abstract class Launcher {
          *
          * <p>
          * In adition to what the current process
-         * is inherited (if this is going to be launched from a slave agent, that
+         * is inherited (if this is going to be launched from a agent agent, that
          * becomes the "current" process), these variables will be also set.
          */
         public ProcStarter envs(Map<String, String> overrides) {
@@ -611,7 +611,7 @@ public abstract class Launcher {
      *      from the current process
      * @param envVars
      *      Environment variable overrides. In addition to what the current process
-     *      is inherited (if this is going to be launched from a slave agent, that
+     *      is inherited (if this is going to be launched from an agent, that
      *      becomes the "current" process), these variables will be also set.
      */
     public abstract Channel launchChannel(String[] cmd, OutputStream out, FilePath workDir, Map<String,String> envVars) throws IOException, InterruptedException;
diff --git a/core/src/main/java/hudson/LocalPluginManager.java b/core/src/main/java/hudson/LocalPluginManager.java
index 4cfbf6ad93..d5926dff2a 100644
--- a/core/src/main/java/hudson/LocalPluginManager.java
+++ b/core/src/main/java/hudson/LocalPluginManager.java
@@ -26,15 +26,9 @@ package hudson;
 
 import jenkins.model.Jenkins;
 
-import javax.servlet.ServletContext;
 import java.io.File;
-import java.io.IOException;
-import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -64,28 +58,11 @@ public class LocalPluginManager extends PluginManager {
             return Collections.emptySet();
         }
 
-        Set<String> names = new HashSet<String>();
-
-        ServletContext context = Jenkins.getInstance().servletContext;
-
-        for( String path : Util.fixNull((Set<String>)context.getResourcePaths("/WEB-INF/plugins"))) {
-            String fileName = path.substring(path.lastIndexOf('/')+1);
-            if(fileName.length()==0) {
-                // see http://www.nabble.com/404-Not-Found-error-when-clicking-on-help-td24508544.html
-                // I suspect some containers are returning directory names.
-                continue;
-            }
-            try {
-                names.add(fileName);
-
-                URL url = context.getResource(path);
-                copyBundledPlugin(url, fileName);
-            } catch (IOException e) {
-                LOGGER.log(Level.SEVERE, "Failed to extract the bundled plugin "+fileName,e);
-            }
+        try {
+            return loadPluginsFromWar("/WEB-INF/plugins");
+        } finally {
+            loadDetachedPlugins();
         }
-
-        return names;
     }
 
     private static final Logger LOGGER = Logger.getLogger(LocalPluginManager.class.getName());
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 9d1a50d27e..52e6e5ba13 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -40,7 +40,6 @@ import hudson.security.Permission;
 import hudson.security.PermissionScope;
 import hudson.util.CyclicGraphDetector;
 import hudson.util.CyclicGraphDetector.CycleDetectedException;
-import hudson.util.IOUtils;
 import hudson.util.PersistedList;
 import hudson.util.Service;
 import hudson.util.VersionNumber;
@@ -49,6 +48,8 @@ import jenkins.ClassLoaderReflectionToolkit;
 import jenkins.InitReactorRunner;
 import jenkins.RestartRequiredException;
 import jenkins.YesNoMaybe;
+import jenkins.install.InstallState;
+import jenkins.install.InstallUtil;
 import jenkins.model.Jenkins;
 import jenkins.util.io.OnMaster;
 import jenkins.util.xml.RestrictiveEntityResolver;
@@ -60,6 +61,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.LogFactory;
 import org.jenkinsci.bytecode.Transformer;
 import org.jvnet.hudson.reactor.Executable;
@@ -67,6 +69,7 @@ import org.jvnet.hudson.reactor.Reactor;
 import org.jvnet.hudson.reactor.ReactorException;
 import org.jvnet.hudson.reactor.TaskBuilder;
 import org.jvnet.hudson.reactor.TaskGraphBuilder;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.stapler.HttpRedirect;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
@@ -79,16 +82,20 @@ import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 import java.io.Closeable;
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -98,11 +105,13 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -120,6 +129,7 @@ import static hudson.init.InitMilestone.*;
 import hudson.model.DownloadService;
 import hudson.util.FormValidation;
 
+import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.SEVERE;
 import static java.util.logging.Level.WARNING;
 import org.kohsuke.accmod.Restricted;
@@ -195,11 +205,6 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
      */
     private final PluginStrategy strategy;
 
-    /**
-     * Manifest of the plugin binaries that are bundled with core.
-     */
-    private final Map<String,Manifest> bundledPluginManifests = new HashMap<String, Manifest>();
-
     public PluginManager(ServletContext context, File rootDir) {
         this.context = context;
 
@@ -387,13 +392,13 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
 
         // lists up initialization tasks about loading plugins.
         return TaskBuilder.union(initializerFinder, // this scans @Initializer in the core once
-            builder,new TaskGraphBuilder() {{
-            requires(PLUGINS_LISTED).attains(PLUGINS_PREPARED).add("Loading plugins",new Executable() {
+                builder, new TaskGraphBuilder() {{
+            requires(PLUGINS_LISTED).attains(PLUGINS_PREPARED).add("Loading plugins", new Executable() {
                 /**
                  * Once the plugins are listed, schedule their initialization.
                  */
                 public void run(Reactor session) throws Exception {
-                    Jenkins.getInstance().lookup.set(PluginInstanceStore.class,new PluginInstanceStore());
+                    Jenkins.getInstance().lookup.set(PluginInstanceStore.class, new PluginInstanceStore());
                     TaskGraphBuilder g = new TaskGraphBuilder();
 
                     // schedule execution of loading plugins
@@ -446,6 +451,190 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
         }});
     }
 
+    protected @Nonnull Set<String> loadPluginsFromWar(@Nonnull String fromPath) {
+        return loadPluginsFromWar(fromPath, null);
+    }
+
+    protected @Nonnull Set<String> loadPluginsFromWar(@Nonnull String fromPath, @CheckForNull FilenameFilter filter) {
+        Set<String> names = new HashSet();
+
+        ServletContext context = Jenkins.getActiveInstance().servletContext;
+        Set<String> plugins = Util.fixNull((Set<String>) context.getResourcePaths(fromPath));
+        Set<URL> copiedPlugins = new HashSet<>();
+        Set<URL> dependencies = new HashSet<>();
+
+        for( String pluginPath : plugins) {
+            String fileName = pluginPath.substring(pluginPath.lastIndexOf('/')+1);
+            if(fileName.length()==0) {
+                // see http://www.nabble.com/404-Not-Found-error-when-clicking-on-help-td24508544.html
+                // I suspect some containers are returning directory names.
+                continue;
+            }
+            try {
+                URL url = context.getResource(pluginPath);
+                if (filter != null && url != null) {
+                    if (!filter.accept(new File(url.getFile()).getParentFile(), fileName)) {
+                        continue;
+                    }
+                }
+
+                names.add(fileName);
+                copyBundledPlugin(url, fileName);
+                copiedPlugins.add(url);
+                try {
+                    addDependencies(url, fromPath, dependencies);
+                } catch (Exception e) {
+                    LOGGER.log(Level.SEVERE, "Failed to resolve dependencies for the bundled plugin " + fileName, e);
+                }
+            } catch (IOException e) {
+                LOGGER.log(Level.SEVERE, "Failed to extract the bundled plugin "+fileName,e);
+            }
+        }
+
+        // Copy dependencies. These are not detached plugins, but are required by them.
+        for (URL dependency : dependencies) {
+            if (copiedPlugins.contains(dependency)) {
+                // Ignore. Already copied.
+                continue;
+            }
+
+            String fileName = new File(dependency.getFile()).getName();
+            try {
+                names.add(fileName);
+                copyBundledPlugin(dependency, fileName);
+                copiedPlugins.add(dependency);
+            } catch (IOException e) {
+                LOGGER.log(Level.SEVERE, "Failed to extract the bundled dependency plugin " + fileName, e);
+            }
+        }
+
+        return names;
+    }
+
+    protected static void addDependencies(URL hpiResUrl, String fromPath, Set<URL> dependencySet) throws URISyntaxException, MalformedURLException {
+        if (dependencySet.contains(hpiResUrl)) {
+            return;
+        }
+
+        Manifest manifest = parsePluginManifest(hpiResUrl);
+        String dependencySpec = manifest.getMainAttributes().getValue("Plugin-Dependencies");
+        if (dependencySpec != null) {
+            String[] dependencyTokens = dependencySpec.split(",");
+            ServletContext context = Jenkins.getActiveInstance().servletContext;
+
+            for (String dependencyToken : dependencyTokens) {
+                if (dependencyToken.endsWith(";resolution:=optional")) {
+                    // ignore optional dependencies
+                    continue;
+                }
+
+                String artifactId = dependencyToken.split(":")[0];
+                URL dependencyURL = context.getResource(fromPath + "/" + artifactId + ".hpi");
+
+                if (dependencyURL == null) {
+                    // Maybe bundling has changed .jpi files
+                    dependencyURL = context.getResource(fromPath + "/" + artifactId + ".jpi");
+                }
+
+                if (dependencyURL != null) {
+                    dependencySet.add(dependencyURL);
+                    // And transitive deps...
+                    addDependencies(dependencyURL, fromPath, dependencySet);
+                }
+            }
+        }
+    }
+
+    /**
+     * Load detached plugins and their dependencies.
+     * <p>
+     * Only loads plugins that:
+     * <ul>
+     *     <li>Have been detached since the last running version.</li>
+     *     <li>Are already installed and need to be upgraded. This can be the case if this Jenkins install has been running since before plugins were "unbundled".</li>
+     *     <li>Are dependencies of one of the above e.g. script-security is not one of the detached plugins but it must be loaded if matrix-project is loaded.</li>
+     * </ul>
+     */
+    protected void loadDetachedPlugins() {
+        InstallState installState = Jenkins.getActiveInstance().getInstallState();
+        if (installState == InstallState.UPGRADE) {
+            VersionNumber lastExecVersion = new VersionNumber(InstallUtil.getLastExecVersion());
+
+            LOGGER.log(INFO, "Upgrading Jenkins. The last running version was {0}. This Jenkins is version {1}.",
+                    new Object[] {lastExecVersion, Jenkins.VERSION});
+
+            final List<ClassicPluginStrategy.DetachedPlugin> detachedPlugins = ClassicPluginStrategy.getDetachedPlugins(lastExecVersion);
+
+            Set<String> loadedDetached = loadPluginsFromWar("/WEB-INF/detached-plugins", new FilenameFilter() {
+                @Override
+                public boolean accept(File dir, String name) {
+                    name = normalisePluginName(name);
+
+                    // If this was a plugin that was detached some time in the past i.e. not just one of the
+                    // plugins that was bundled "for fun".
+                    if (ClassicPluginStrategy.isDetachedPlugin(name)) {
+                        // If it's already installed and the installed version is older
+                        // than the bundled version, then we upgrade. The bundled version is the min required version
+                        // for "this" version of Jenkins, so we must upgrade.
+                        VersionNumber installedVersion = getPluginVersion(rootDir, name);
+                        VersionNumber bundledVersion = getPluginVersion(dir, name);
+                        if (installedVersion != null && bundledVersion != null && installedVersion.isOlderThan(bundledVersion)) {
+                            return true;
+                        }
+                    }
+
+                    // If it's a plugin that was detached since the last running version.
+                    for (ClassicPluginStrategy.DetachedPlugin detachedPlugin : detachedPlugins) {
+                        if (detachedPlugin.getShortName().equals(name)) {
+                            return true;
+                        }
+                    }
+
+                    // Otherwise skip this and do not install.
+                    return false;
+                }
+            });
+
+            LOGGER.log(INFO, "Upgraded Jenkins from version {0} to version {1}. Loaded detached plugins (and dependencies): {2}",
+                    new Object[] {lastExecVersion, Jenkins.VERSION, loadedDetached});
+
+            InstallUtil.saveLastExecVersion();
+        }
+    }
+
+    private String normalisePluginName(@Nonnull String name) {
+        // Normalise the name by stripping off the file extension (if present)...
+        return name.replace(".jpi", "").replace(".hpi", "");
+    }
+
+    private @CheckForNull VersionNumber getPluginVersion(@Nonnull File dir, @Nonnull String pluginId) {
+        VersionNumber version = getPluginVersion(new File(dir, pluginId + ".jpi"));
+        if (version == null) {
+            version = getPluginVersion(new File(dir, pluginId + ".hpi"));
+        }
+        return version;
+    }
+
+    private @CheckForNull VersionNumber getPluginVersion(@Nonnull File pluginFile) {
+        if (!pluginFile.exists()) {
+            return null;
+        }
+        try {
+            return getPluginVersion(pluginFile.toURI().toURL());
+        } catch (MalformedURLException e) {
+            return null;
+        }
+    }
+
+    private @CheckForNull VersionNumber getPluginVersion(@Nonnull URL pluginURL) {
+        Manifest manifest = parsePluginManifest(pluginURL);
+        if (manifest == null) {
+            return null;
+        }
+        String versionSpec = manifest.getMainAttributes().getValue("Plugin-Version");
+        return new VersionNumber(versionSpec);
+    }
+
     /*
      * contains operation that considers xxx.hpi and xxx.jpi as equal
      * this is necessary since the bundled plugins are still called *.hpi
@@ -458,8 +647,9 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
     /**
      * Returns the manifest of a bundled but not-extracted plugin.
      */
+    @Deprecated // See https://groups.google.com/d/msg/jenkinsci-dev/kRobm-cxFw8/6V66uhibAwAJ
     public @CheckForNull Manifest getBundledPluginManifest(String shortName) {
-        return bundledPluginManifests.get(shortName);
+        return null;
     }
 
     /**
@@ -489,8 +679,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
         // so existing plugins can't be depending on this newly deployed one.
 
         plugins.add(p);
-        if (p.isActive())
-            activePlugins.add(p);
+        activePlugins.add(p);
         synchronized (((UberClassLoader) uberClassLoader).loaded) {
             ((UberClassLoader) uberClassLoader).loaded.clear();
         }
@@ -590,16 +779,14 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
         String legacyName = fileName.replace(".jpi",".hpi");
         long lastModified = src.openConnection().getLastModified();
         File file = new File(rootDir, fileName);
-        File pinFile = new File(rootDir, fileName+".pinned");
 
         // normalization first, if the old file exists.
         rename(new File(rootDir,legacyName),file);
-        rename(new File(rootDir,legacyName+".pinned"),pinFile);
 
         // update file if:
         //  - no file exists today
-        //  - bundled version and current version differs (by timestamp), and the file isn't pinned.
-        if (!file.exists() || (file.lastModified() != lastModified && !pinFile.exists())) {
+        //  - bundled version and current version differs (by timestamp).
+        if (!file.exists() || file.lastModified() != lastModified) {
             FileUtils.copyURLToFile(src, file);
             file.setLastModified(src.openConnection().getLastModified());
             // lastModified is set for two reasons:
@@ -607,15 +794,12 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
             // - to make sure the value is not changed after each restart, so we can avoid
             // unpacking the plugin itself in ClassicPluginStrategy.explode
         }
-        if (pinFile.exists())
-            parsePinnedBundledPluginManifest(src);
+
+        // Plugin pinning has been deprecated.
+        // See https://groups.google.com/d/msg/jenkinsci-dev/kRobm-cxFw8/6V66uhibAwAJ
     }
 
-    /**
-     * When a pin file prevented a bundled plugin from getting extracted, check if the one we currently have
-     * is older than we bundled.
-     */
-    private void parsePinnedBundledPluginManifest(URL bundledJpi) {
+    private static @CheckForNull Manifest parsePluginManifest(URL bundledJpi) {
         try {
             URLClassLoader cl = new URLClassLoader(new URL[]{bundledJpi});
             InputStream in=null;
@@ -624,8 +808,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
                 if (res!=null) {
                     in = res.openStream();
                     Manifest manifest = new Manifest(in);
-                    String shortName = PluginWrapper.computeShortName(manifest, FilenameUtils.getName(bundledJpi.getPath()));
-                    bundledPluginManifests.put(shortName, manifest);
+                    return manifest;
                 }
             } finally {
                 IOUtils.closeQuietly(in);
@@ -635,6 +818,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
         } catch (IOException e) {
             LOGGER.log(WARNING, "Failed to parse manifest of "+bundledJpi, e);
         }
+        return null;
     }
 
     /**
@@ -803,6 +987,54 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
         LogFactory.release(uberClassLoader);
     }
 
+    /**
+     * Get the list of all plugins - available and installed.
+     * @return The list of all plugins - available and installed.
+     */
+    @Restricted(DoNotUse.class) // WebOnly
+    public HttpResponse doPlugins() {
+        JSONArray response = new JSONArray();
+        Map<String,JSONObject> allPlugins = new HashMap<>();
+        for (PluginWrapper plugin : plugins) {
+            JSONObject pluginInfo = new JSONObject();
+            pluginInfo.put("installed", true);
+            pluginInfo.put("name", plugin.getShortName());
+            pluginInfo.put("title", plugin.getDisplayName());
+            pluginInfo.put("active", plugin.isActive());
+            pluginInfo.put("enabled", plugin.isEnabled());
+            pluginInfo.put("bundled", plugin.isBundled);
+            pluginInfo.put("deleted", plugin.isDeleted());
+            pluginInfo.put("downgradable", plugin.isDowngradable());
+            List<Dependency> dependencies = plugin.getDependencies();
+            if (dependencies != null && !dependencies.isEmpty()) {
+                Map<String, String> dependencyMap = new HashMap<>();
+                for (Dependency dependency : dependencies) {
+                    dependencyMap.put(dependency.shortName, dependency.version);
+                }
+                pluginInfo.put("dependencies", dependencyMap);
+            } else {
+                pluginInfo.put("dependencies", Collections.emptyMap());
+            }
+            response.add(pluginInfo);
+        }
+        for (UpdateSite site : Jenkins.getActiveInstance().getUpdateCenter().getSiteList()) {
+            for (UpdateSite.Plugin plugin: site.getAvailables()) {
+                JSONObject pluginInfo = allPlugins.get(plugin.name);
+                if(pluginInfo == null) {
+			pluginInfo = new JSONObject();
+			pluginInfo.put("installed", false);
+                }
+                pluginInfo.put("name", plugin.name);
+                pluginInfo.put("title", plugin.getDisplayName());
+                pluginInfo.put("excerpt", plugin.excerpt);
+                pluginInfo.put("site", site.getId());
+                pluginInfo.put("dependencies", plugin.dependencies);
+                response.add(pluginInfo);
+            }
+        }
+        return hudson.util.HttpResponses.okJSON(response);
+    }
+
     public HttpResponse doUpdateSources(StaplerRequest req) throws IOException {
         Jenkins.getInstance().checkPermission(CONFIGURE_UPDATECENTER);
 
@@ -826,43 +1058,143 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
      * Performs the installation of the plugins.
      */
     public void doInstall(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
-        boolean dynamicLoad = req.getParameter("dynamicLoad")!=null;
-        final List<Future<UpdateCenter.UpdateCenterJob>> deployJobs = new ArrayList<>();
+        Set<String> plugins = new LinkedHashSet<>();
 
         Enumeration<String> en = req.getParameterNames();
         while (en.hasMoreElements()) {
             String n =  en.nextElement();
             if(n.startsWith("plugin.")) {
                 n = n.substring(7);
-                // JENKINS-22080 plugin names can contain '.' as could (according to rumour) update sites
-                int index = n.indexOf('.');
-                UpdateSite.Plugin p = null;
+                plugins.add(n);
+            }
+        }
+
+        boolean dynamicLoad = req.getParameter("dynamicLoad")!=null;
+        install(plugins, dynamicLoad);
+
+        rsp.sendRedirect("../updateCenter/");
+    }
+
+    /**
+     * Installs a list of plugins from a JSON POST.
+     * @param req The request object.
+     * @return A JSON response that includes a "correlationId" in the "data" element.
+     * That "correlationId" can then be used in calls to
+     * {@link UpdateCenter#doInstallStatus(org.kohsuke.stapler.StaplerRequest)}.
+     * @throws IOException Error reading JSON payload fro request.
+     */
+    @RequirePOST
+    @Restricted(DoNotUse.class) // WebOnly
+    public HttpResponse doInstallPlugins(StaplerRequest req) throws IOException {
+        String payload = IOUtils.toString(req.getInputStream(), req.getCharacterEncoding());
+        JSONObject request = JSONObject.fromObject(payload);
+        JSONArray pluginListJSON = request.getJSONArray("plugins");
+        List<String> plugins = new ArrayList<>();
+
+        for (int i = 0; i < pluginListJSON.size(); i++) {
+            plugins.add(pluginListJSON.getString(i));
+        }
+
+        UUID correlationId = UUID.randomUUID();
+        try {
+            boolean dynamicLoad = request.getBoolean("dynamicLoad");
+            install(plugins, dynamicLoad, correlationId);
+
+            JSONObject responseData = new JSONObject();
+            responseData.put("correlationId", correlationId.toString());
+
+            return hudson.util.HttpResponses.okJSON(responseData);
+        } catch (Exception e) {
+            return hudson.util.HttpResponses.errorJSON(e.getMessage());
+        }
+    }
+
+    /**
+     * Performs the installation of the plugins.
+     * @param plugins The collection of plugins to install.
+     * @param dynamicLoad If true, the plugin will be dynamically loaded into this Jenkins. If false,
+     *                    the plugin will only take effect after the reboot.
+     *                    See {@link UpdateCenter#isRestartRequiredForCompletion()}
+     * @return The install job list.
+     * @since FIXME
+     */
+    public List<Future<UpdateCenter.UpdateCenterJob>> install(@Nonnull Collection<String> plugins, boolean dynamicLoad) {
+        return install(plugins, dynamicLoad, null);
+    }
+
+    private List<Future<UpdateCenter.UpdateCenterJob>> install(@Nonnull Collection<String> plugins, boolean dynamicLoad, @CheckForNull UUID correlationId) {
+        List<Future<UpdateCenter.UpdateCenterJob>> installJobs = new ArrayList<>();
+
+        for (String n : plugins) {
+            // JENKINS-22080 plugin names can contain '.' as could (according to rumour) update sites
+            int index = n.indexOf('.');
+            UpdateSite.Plugin p = null;
+
+            if (index == -1) {
+                p = getPlugin(n, UpdateCenter.ID_DEFAULT);
+            } else {
                 while (index != -1) {
                     if (index + 1 >= n.length()) {
                         break;
                     }
                     String pluginName = n.substring(0, index);
                     String siteName = n.substring(index + 1);
-                    UpdateSite updateSite = Jenkins.getInstance().getUpdateCenter().getById(siteName);
-                    if (updateSite == null) {
-                        throw new Failure("No such update center: " + siteName);
-                    } else {
-                        UpdateSite.Plugin plugin = updateSite.getPlugin(pluginName);
-                        if (plugin != null) {
-                            if (p != null) {
-                                throw new Failure("Ambiguous plugin: " + n);
-                            }
-                            p = plugin;
+                    UpdateSite.Plugin plugin = getPlugin(pluginName, siteName);
+                    // There could be cases like:
+                    // 'plugin.ambiguous.updatesite' where both
+                    // 'plugin' @ 'ambigiuous.updatesite' and 'plugin.ambiguous' @ 'updatesite' resolve to valid plugins
+                    if (plugin != null) {
+                        if (p != null) {
+                            throw new Failure("Ambiguous plugin: " + n);
                         }
+                        p = plugin;
                     }
                     index = n.indexOf('.', index + 1);
                 }
-                if (p == null) {
-                    throw new Failure("No such plugin: " + n);
-                }
-                
-                deployJobs.add(p.deploy(dynamicLoad));
             }
+            
+            if (p == null) {
+                throw new Failure("No such plugin: " + n);
+            }
+            Future<UpdateCenter.UpdateCenterJob> jobFuture = p.deploy(dynamicLoad, correlationId);
+            installJobs.add(jobFuture);
+        }
+
+        if (Jenkins.getActiveInstance().getInstallState() == InstallState.NEW) {
+            trackInitialPluginInstall(installJobs);
+        }
+
+        return installJobs;
+    }
+
+    private void trackInitialPluginInstall(@Nonnull final List<Future<UpdateCenter.UpdateCenterJob>> installJobs) {
+        final Jenkins jenkins = Jenkins.getActiveInstance();
+        final UpdateCenter updateCenter = jenkins.getUpdateCenter();
+
+        updateCenter.persistInstallStatus();
+        if (jenkins.getInstallState() == InstallState.NEW) {
+            jenkins.setInstallState(InstallState.INITIAL_PLUGINS_INSTALLING);
+            new Thread() {
+                @Override
+                public void run() {
+                    INSTALLING: while (true) {
+                        try {
+				updateCenter.persistInstallStatus();
+                            Thread.sleep(500);
+                            for (Future<UpdateCenter.UpdateCenterJob> jobFuture : installJobs) {
+                                if(!jobFuture.isDone() && !jobFuture.isCancelled()) {
+                                    continue INSTALLING;
+                                }
+                            }
+                        } catch (InterruptedException e) {
+                            LOGGER.log(WARNING, "Unexpected error while waiting for initial plugin set to install.", e);
+                        }
+                        break;
+                    }
+			updateCenter.persistInstallStatus();
+                    jenkins.setInstallState(InstallState.INITIAL_PLUGINS_INSTALLING.getNextState());
+                }
+            }.start();
         }
         
         // Fire a one-off thread to wait for the plugins to be deployed and then
@@ -871,7 +1203,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
             @Override
             public void run() {
                 INSTALLING: while (true) {
-                    for (Future<UpdateCenter.UpdateCenterJob> deployJob : deployJobs) {
+                    for (Future<UpdateCenter.UpdateCenterJob> deployJob : installJobs) {
                         try {
                             Thread.sleep(500);
                         } catch (InterruptedException e) {
@@ -890,9 +1222,15 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
             }
         }.start();
         
-        rsp.sendRedirect("../updateCenter/");
     }
 
+    private UpdateSite.Plugin getPlugin(String pluginName, String siteName) {
+        UpdateSite updateSite = Jenkins.getInstance().getUpdateCenter().getById(siteName);
+        if (updateSite == null) {
+            throw new Failure("No such update center: " + siteName);
+        }
+        return updateSite.getPlugin(pluginName);
+    }
 
     /**
      * Bare-minimum configuration mechanism to change the update center.
diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
index b78c19f59e..c30dba8ae2 100644
--- a/core/src/main/java/hudson/PluginWrapper.java
+++ b/core/src/main/java/hudson/PluginWrapper.java
@@ -87,12 +87,6 @@ import javax.annotation.Nonnull;
  */
 @ExportedBean
 public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
-    /**
-     * A plugin won't be loaded unless his declared dependencies are present and match the required minimal version.
-     * This can be set to false to disable the version check (legacy behaviour)
-     */
-    private static final boolean ENABLE_PLUGIN_DEPENDENCIES_VERSION_CHECK = Boolean.parseBoolean(System.getProperty(PluginWrapper.class.getName()+"." + "dependenciesVersionCheck.enabled", "true"));
-
     /**
      * {@link PluginManager} to which this belongs to.
      */
@@ -123,15 +117,6 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
      */
     private final File disableFile;
 
-    /**
-     * Used to control the unpacking of the bundled plugin.
-     * If a pin file exists, Jenkins assumes that the user wants to pin down a particular version
-     * of a plugin, and will not try to overwrite it. Otherwise, it'll be overwritten
-     * by a bundled copy, to ensure consistency across upgrade/downgrade.
-     * @since 1.325
-     */
-    private final File pinFile;
-
     /**
      * A .jpi file, an exploded plugin directory, or a .jpl file.
      */
@@ -223,10 +208,10 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
             if(idx==-1)
                 throw new IllegalArgumentException("Illegal dependency specifier "+s);
             this.shortName = s.substring(0,idx);
-            String version = s.substring(idx+1);
-
+            this.version = s.substring(idx+1);
+            
             boolean isOptional = false;
-            String[] osgiProperties = version.split("[;]");
+            String[] osgiProperties = s.split(";");
             for (int i = 1; i < osgiProperties.length; i++) {
                 String osgiProperty = osgiProperties[i].trim();
                 if (osgiProperty.equalsIgnoreCase("resolution:=optional")) {
@@ -234,16 +219,11 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
                 }
             }
             this.optional = isOptional;
-            if (isOptional) {
-                this.version = osgiProperties[0];
-            } else {
-                this.version = version;
-            }
         }
 
         @Override
         public String toString() {
-            return shortName + " (" + version + ") " + (optional ? "optional" : "");
+            return shortName + " (" + version + ")";
         }        
     }
 
@@ -270,7 +250,6 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
 		this.baseResourceURL = baseResourceURL;
 		this.classLoader = classLoader;
 		this.disableFile = disableFile;
-        this.pinFile = new File(archive.getPath() + ".pinned");
 		this.active = !disableFile.exists();
 		this.dependencies = dependencies;
 		this.optionalDependencies = optionalDependencies;
@@ -408,21 +387,6 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
         return "???";
     }
 
-    /**
-     * Returns the required Jenkins core version of this plugin.
-     * @return the required Jenkins core version of this plugin.
-     * @since 1.657
-     */
-    @Exported
-    public @CheckForNull String getRequiredCoreVersion() {
-        String v = manifest.getMainAttributes().getValue("Jenkins-Version");
-        if (v!= null) return v;
-
-        v = manifest.getMainAttributes().getValue("Hudson-Version");
-        if (v!= null) return v;
-        return null;
-    }
-
     /**
      * Returns the version number of this plugin
      */
@@ -549,71 +513,19 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
      *             thrown if one or several mandatory dependencies doesn't exists.
      */
     /*package*/ void resolvePluginDependencies() throws IOException {
-        if (ENABLE_PLUGIN_DEPENDENCIES_VERSION_CHECK) {
-            String requiredCoreVersion = getRequiredCoreVersion();
-            if (requiredCoreVersion == null) {
-                LOGGER.warning(shortName + " doesn't declare required core version.");
-            } else {
-                if (Jenkins.getVersion().isOlderThan(new VersionNumber(requiredCoreVersion))) {
-                    throw new IOException(shortName + " requires a more recent core version (" + requiredCoreVersion + ") than the current (" + Jenkins.getVersion() + ").");
-                }
-            }
-        }
         List<String> missingDependencies = new ArrayList<String>();
-        List<String> obsoleteDependencies = new ArrayList<String>();
-        List<String> disabledDependencies = new ArrayList<String>();
         // make sure dependencies exist
         for (Dependency d : dependencies) {
-            PluginWrapper dependency = parent.getPlugin(d.shortName);
-            if (dependency == null) {
+            if (parent.getPlugin(d.shortName) == null)
                 missingDependencies.add(d.toString());
-            } else {
-                if (dependency.isActive()) {
-                    if (ENABLE_PLUGIN_DEPENDENCIES_VERSION_CHECK && dependency.getVersionNumber().isOlderThan(new VersionNumber(d.version))) {
-                        obsoleteDependencies.add(dependency.getShortName() + "(" + dependency.getVersion() + " < " + d.version + ")");
-                    }
-                } else {
-                    disabledDependencies.add(d.toString());
-                }
-
-            }
         }
+        if (!missingDependencies.isEmpty())
+            throw new IOException("Dependency "+Util.join(missingDependencies, ", ")+" doesn't exist");
+
         // add the optional dependencies that exists
         for (Dependency d : optionalDependencies) {
-            PluginWrapper dependency = parent.getPlugin(d.shortName);
-            if (dependency != null && dependency.isActive()) {
-                if (ENABLE_PLUGIN_DEPENDENCIES_VERSION_CHECK && dependency.getVersionNumber().isOlderThan(new VersionNumber(d.version))) {
-                    obsoleteDependencies.add(dependency.getShortName() + "(" + dependency.getVersion() + " < " + d.version + ")");
-                } else {
-                    dependencies.add(d);
-                }
-            }
-        }
-        StringBuilder messageBuilder = new StringBuilder();
-        if (!missingDependencies.isEmpty()) {
-            boolean plural = missingDependencies.size() > 1;
-            messageBuilder.append(plural ? "Dependencies " : "Dependency ")
-                    .append(Util.join(missingDependencies, ", "))
-                    .append(" ").append(plural ? "don't" : "doesn't")
-                    .append(" exist. ");
-        }
-        if (!disabledDependencies.isEmpty()) {
-            boolean plural = disabledDependencies.size() > 1;
-            messageBuilder.append(plural ? "Dependencies " : "Dependency ")
-                    .append(Util.join(disabledDependencies, ", "))
-                    .append(" ").append(plural ? "are" : "is")
-                    .append(" disabled. ");
-        }
-        if (!obsoleteDependencies.isEmpty()) {
-            boolean plural = obsoleteDependencies.size() > 1;
-            messageBuilder.append(plural ? "Dependencies " : "Dependency ")
-                    .append(Util.join(obsoleteDependencies, ", "))
-                    .append(" ").append(plural ? "are" : "is")
-                    .append(" older than required.");
-        }
-        String message = messageBuilder.toString();
-        if (!message.isEmpty()) {
-            throw new IOException(message);
+            if (parent.getPlugin(d.shortName) != null)
+                dependencies.add(d);
         }
     }
 
@@ -653,8 +565,9 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
     }
     
     @Exported
+    @Deprecated // See https://groups.google.com/d/msg/jenkinsci-dev/kRobm-cxFw8/6V66uhibAwAJ
     public boolean isPinned() {
-        return pinFile.exists();
+        return false;
     }
 
     /**
@@ -716,16 +629,9 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
     /**
      * Checks if this plugin is pinned and that's forcing us to use an older version than the bundled one.
      */
+    @Deprecated // See https://groups.google.com/d/msg/jenkinsci-dev/kRobm-cxFw8/6V66uhibAwAJ
     public boolean isPinningForcingOldVersion() {
-        if (!isPinned())    return false;
-
-        Manifest bundled = Jenkins.getInstance().pluginManager.getBundledPluginManifest(getShortName());
-        if (bundled==null)  return false;
-
-        VersionNumber you = new VersionNumber(getVersionOf(bundled));
-        VersionNumber me = getVersionNumber();
-
-        return me.isOlderThan(you);
+        return false;
     }
 
 //
@@ -748,16 +654,18 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
     }
 
     @RequirePOST
+    @Deprecated
     public HttpResponse doPin() throws IOException {
-        Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
-        new FileOutputStream(pinFile).close();
+        // See https://groups.google.com/d/msg/jenkinsci-dev/kRobm-cxFw8/6V66uhibAwAJ
+        LOGGER.log(WARNING, "Call to pin plugin has been ignored. Plugin name: " + shortName);
         return HttpResponses.ok();
     }
 
     @RequirePOST
+    @Deprecated
     public HttpResponse doUnpin() throws IOException {
-        Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
-        pinFile.delete();
+        // See https://groups.google.com/d/msg/jenkinsci-dev/kRobm-cxFw8/6V66uhibAwAJ
+        LOGGER.log(WARNING, "Call to unpin plugin has been ignored. Plugin name: " + shortName);
         return HttpResponses.ok();
     }
 
diff --git a/core/src/main/java/hudson/ProxyConfiguration.java b/core/src/main/java/hudson/ProxyConfiguration.java
index 58f41d610f..025f9e5373 100644
--- a/core/src/main/java/hudson/ProxyConfiguration.java
+++ b/core/src/main/java/hudson/ProxyConfiguration.java
@@ -74,6 +74,12 @@ import org.kohsuke.stapler.QueryParameter;
  * @see jenkins.model.Jenkins#proxy
  */
 public final class ProxyConfiguration extends AbstractDescribableImpl<ProxyConfiguration> implements Saveable, Serializable {
+    /**
+     * Holds a default TCP connect timeout set on all connections returned from this class,
+     * note this is value is in milliseconds, it's passed directly to {@link URLConnection#setConnectTimeout(int)}
+     */
+    private static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = Integer.getInteger("hudson.ProxyConfiguration.DEFAULT_CONNECT_TIMEOUT_MILLIS", 20 * 1000);
+    
     public final String name;
     public final int port;
 
@@ -218,22 +224,29 @@ public final class ProxyConfiguration extends AbstractDescribableImpl<ProxyConfi
      */
     public static URLConnection open(URL url) throws IOException {
         final ProxyConfiguration p = get();
-        if(p==null)
-            return url.openConnection();
-
-        URLConnection con = url.openConnection(p.createProxy(url.getHost()));
-        if(p.getUserName()!=null) {
-            // Add an authenticator which provides the credentials for proxy authentication
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                public PasswordAuthentication getPasswordAuthentication() {
-                    if (getRequestorType()!=RequestorType.PROXY)    return null;
-                    return new PasswordAuthentication(p.getUserName(),
-                            p.getPassword().toCharArray());
-                }
-            });
+        
+        URLConnection con;
+        if(p==null) {
+            con = url.openConnection();
+        } else {
+            con = url.openConnection(p.createProxy(url.getHost()));
+            if(p.getUserName()!=null) {
+                // Add an authenticator which provides the credentials for proxy authentication
+                Authenticator.setDefault(new Authenticator() {
+                    @Override
+                    public PasswordAuthentication getPasswordAuthentication() {
+                        if (getRequestorType()!=RequestorType.PROXY)    return null;
+                        return new PasswordAuthentication(p.getUserName(),
+                                p.getPassword().toCharArray());
+                    }
+                });
+            }
         }
-
+        
+        if(DEFAULT_CONNECT_TIMEOUT_MILLIS > 0) {
+            con.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT_MILLIS);
+        }
+        
         if (JenkinsJVM.isJenkinsJVM()) { // this code may run on a slave
             decorate(con);
         }
@@ -329,7 +342,7 @@ public final class ProxyConfiguration extends AbstractDescribableImpl<ProxyConfi
             GetMethod method = null;
             try {
                 method = new GetMethod(testUrl);
-                method.getParams().setParameter("http.socket.timeout", new Integer(30 * 1000));
+                method.getParams().setParameter("http.socket.timeout", DEFAULT_CONNECT_TIMEOUT_MILLIS > 0 ? DEFAULT_CONNECT_TIMEOUT_MILLIS : new Integer(30 * 1000));
                 
                 HttpClient client = new HttpClient();
                 if (Util.fixEmptyAndTrim(name) != null) {
diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java
index 28424181e8..79b48fbf21 100644
--- a/core/src/main/java/hudson/TcpSlaveAgentListener.java
+++ b/core/src/main/java/hudson/TcpSlaveAgentListener.java
@@ -46,11 +46,11 @@ import java.util.logging.Logger;
 import org.apache.commons.io.IOUtils;
 
 /**
- * Listens to incoming TCP connections from JNLP slave agents and CLI.
+ * Listens to incoming TCP connections from JNLP agents and CLI.
  *
  * <p>
  * Aside from the HTTP endpoint, Jenkins runs {@link TcpSlaveAgentListener} that listens on a TCP socket.
- * Historically  this was used for inbound connection from slave agents (hence the name), but over time
+ * Historically  this was used for inbound connection from agents (hence the name), but over time
  * it was extended and made generic, so that multiple protocols of different purposes can co-exist on the
  * same socket.
  *
@@ -73,7 +73,7 @@ public final class TcpSlaveAgentListener extends Thread {
      *      Use 0 to choose a random port.
      */
     public TcpSlaveAgentListener(int port) throws IOException {
-        super("TCP slave agent listener port="+port);
+        super("TCP agent listener port="+port);
         try {
             serverSocket = ServerSocketChannel.open();
             serverSocket.socket().bind(new InetSocketAddress(port));
@@ -82,7 +82,7 @@ public final class TcpSlaveAgentListener extends Thread {
         }
         this.configuredPort = port;
 
-        LOGGER.log(Level.FINE, "JNLP slave agent listener started on TCP port {0}", getPort());
+        LOGGER.log(Level.FINE, "JNLP agent listener started on TCP port {0}", getPort());
 
         start();
     }
@@ -120,7 +120,7 @@ public final class TcpSlaveAgentListener extends Thread {
             }
         } catch (IOException e) {
             if(!shuttingDown) {
-                LOGGER.log(Level.SEVERE,"Failed to accept JNLP slave agent connections",e);
+                LOGGER.log(Level.SEVERE,"Failed to accept JNLP agent connections",e);
             }
         }
     }
@@ -159,7 +159,7 @@ public final class TcpSlaveAgentListener extends Thread {
             synchronized(getClass()) {
                 id = iotaGen++;
             }
-            setName("TCP slave agent connection handler #"+id+" with "+s.getRemoteSocketAddress());
+            setName("TCP agent connection handler #"+id+" with "+s.getRemoteSocketAddress());
         }
 
         @Override
diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java
index 5fe796eb9b..7a5a78c5f2 100644
--- a/core/src/main/java/hudson/WebAppMain.java
+++ b/core/src/main/java/hudson/WebAppMain.java
@@ -119,8 +119,6 @@ public class WebAppMain implements ServletContextListener {
 
             installLogger();
 
-            markCookieAsHttpOnly(context);
-
             final FileAndDescription describedHomeDir = getHomeDir(event);
             home = describedHomeDir.file.getAbsoluteFile();
             home.mkdirs();
@@ -256,31 +254,6 @@ public class WebAppMain implements ServletContextListener {
         }
     }
 
-    /**
-     * Set the session cookie as HTTP only.
-     *
-     * @see <a href="https://www.owasp.org/index.php/HttpOnly">discussion of this topic in OWASP</a>
-     */
-    private void markCookieAsHttpOnly(ServletContext context) {
-        try {
-            Method m;
-            try {
-                m = context.getClass().getMethod("getSessionCookieConfig");
-            } catch (NoSuchMethodException x) { // 3.0+
-                LOGGER.log(Level.FINE, "Failed to set secure cookie flag", x);
-                return;
-            }
-            Object sessionCookieConfig = m.invoke(context);
-
-            // not exposing session cookie to JavaScript to mitigate damage caused by XSS
-            Class scc = Class.forName("javax.servlet.SessionCookieConfig");
-            Method setHttpOnly = scc.getMethod("setHttpOnly",boolean.class);
-            setHttpOnly.invoke(sessionCookieConfig,true);
-        } catch (Exception e) {
-            LOGGER.log(Level.WARNING, "Failed to set HTTP-only cookie flag", e);
-        }
-    }
-
     public void joinInit() throws InterruptedException {
         initThread.join();
     }
diff --git a/core/src/main/java/hudson/cli/GroovyshCommand.java b/core/src/main/java/hudson/cli/GroovyshCommand.java
index 6299c60576..2807d872d0 100644
--- a/core/src/main/java/hudson/cli/GroovyshCommand.java
+++ b/core/src/main/java/hudson/cli/GroovyshCommand.java
@@ -41,7 +41,7 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 
 import jline.UnsupportedTerminal;
-import jline.Terminal;
+import jline.TerminalFactory;
 import org.kohsuke.args4j.Argument;
 
 /**
@@ -65,10 +65,18 @@ public class GroovyshCommand extends CLICommand {
 
         // this being remote means no jline capability is available
         System.setProperty("jline.terminal", UnsupportedTerminal.class.getName());
-        Terminal.resetTerminal();
+        TerminalFactory.reset();
+
+        StringBuilder commandLine = new StringBuilder();
+        for (String arg : args) {
+            if (commandLine.length() > 0) {
+                commandLine.append(" ");
+            }
+            commandLine.append(arg);
+        }
 
         Groovysh shell = createShell(stdin, stdout, stderr);
-        return shell.run(args.toArray(new String[args.size()]));
+        return shell.run(commandLine.toString());
     }
 
     @SuppressWarnings({"unchecked","rawtypes"})
@@ -101,7 +109,7 @@ public class GroovyshCommand extends CLICommand {
             }
         };
         Groovysh shell = new Groovysh(cl, binding, io, registrar);
-        shell.getImports().add("import hudson.model.*");
+        shell.getImports().add("hudson.model.*");
 
         // defaultErrorHook doesn't re-throw IOException, so ShellRunner in
         // Groovysh will keep looping forever if we don't terminate when the
diff --git a/core/src/main/java/hudson/cli/OnlineNodeCommand.java b/core/src/main/java/hudson/cli/OnlineNodeCommand.java
index 10bd1523d7..5dff2e7939 100644
--- a/core/src/main/java/hudson/cli/OnlineNodeCommand.java
+++ b/core/src/main/java/hudson/cli/OnlineNodeCommand.java
@@ -40,7 +40,7 @@ import java.util.logging.Logger;
 @Extension
 public class OnlineNodeCommand extends CLICommand {
 
-    @Argument(metaVar="NAME", usage="Slave name, or empty string for master")
+    @Argument(metaVar="NAME", usage="Agent name, or empty string for master")
     public String computerName;
 
     @Override
diff --git a/core/src/main/java/hudson/console/ConsoleLogFilter.java b/core/src/main/java/hudson/console/ConsoleLogFilter.java
index 49116ab982..ec1b0c0592 100644
--- a/core/src/main/java/hudson/console/ConsoleLogFilter.java
+++ b/core/src/main/java/hudson/console/ConsoleLogFilter.java
@@ -88,10 +88,10 @@ public abstract class ConsoleLogFilter implements ExtensionPoint {
     }
 
     /**
-     * Called to decorate logger for master/slave communication.
+     * Called to decorate logger for master/agent communication.
      *
      * @param computer
-     *      Slave computer for which the logger is getting decorated. Useful to do
+     *      Agent computer for which the logger is getting decorated. Useful to do
      *      contextual decoration.
      * @since 1.632
      */
diff --git a/core/src/main/java/hudson/init/InitStrategy.java b/core/src/main/java/hudson/init/InitStrategy.java
index 7b8497405d..9012b4c65a 100644
--- a/core/src/main/java/hudson/init/InitStrategy.java
+++ b/core/src/main/java/hudson/init/InitStrategy.java
@@ -10,7 +10,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -50,15 +49,6 @@ public class InitStrategy {
         // for example, while doing "mvn jpi:run" or "mvn hpi:run" on a plugin that's bundled with Jenkins, we want to the
         // *.jpl file to override the bundled jpi/hpi file.
         getBundledPluginsFromProperty(r);
-        Iterator<File> it = r.iterator();
-        while (it.hasNext()) {
-            File f = it.next();
-            if (new File(pm.rootDir, f.getName().replace(".hpi", ".jpi") + ".pinned").isFile()) {
-                // Cf. PluginManager.copyBundledPlugin, which is not called in this case.
-                LOGGER.log(Level.INFO, "ignoring {0} since this plugin is pinned", f);
-                it.remove();
-            }
-        }
 
         // similarly, we prefer *.jpi over *.hpi
         listPluginFiles(pm, ".jpl", r); // linked plugin. for debugging.
diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java
index 17ec36ee16..af6fb378ce 100644
--- a/core/src/main/java/hudson/logging/LogRecorder.java
+++ b/core/src/main/java/hudson/logging/LogRecorder.java
@@ -208,7 +208,7 @@ public class LogRecorder extends AbstractModelObject implements Saveable {
     }
 
     private static final class SetLevel extends MasterToSlaveCallable<Void,Error> {
-        /** known loggers (kept per slave), to avoid GC */
+        /** known loggers (kept per agent), to avoid GC */
         @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") private static final Set<Logger> loggers = new HashSet<Logger>();
         private final String name;
         private final Level level;
@@ -363,7 +363,7 @@ public class LogRecorder extends AbstractModelObject implements Saveable {
     }
 
     /**
-     * Gets a view of log records per slave matching this recorder.
+     * Gets a view of log records per agent matching this recorder.
      * @return a map (sorted by display name) from computer to (nonempty) list of log records
      * @since 1.519
      */
diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index e9c4626706..582f883945 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -109,7 +109,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
     private static final boolean upstreamCulprits = Boolean.getBoolean("hudson.upstreamCulprits");
 
     /**
-     * Name of the slave this project was built on.
+     * Name of the agent this project was built on.
      * Null or "" if built by the master. (null happens when we read old record that didn't have this information.)
      */
     private String builtOn;
@@ -205,7 +205,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
      * Returns a {@link Slave} on which this build was done.
      *
      * @return
-     *      null, for example if the slave that this build run no longer exists.
+     *      null, for example if the agent that this build run no longer exists.
      */
     public @CheckForNull Node getBuiltOn() {
         if (builtOn==null || builtOn.equals(""))
@@ -215,7 +215,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
     }
 
     /**
-     * Returns the name of the slave it was built on; null or "" if built by the master.
+     * Returns the name of the agent it was built on; null or "" if built by the master.
      * (null happens when we read old record that didn't have this information.)
      */
     @Exported(name="builtOn")
@@ -276,7 +276,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
      * {@link AbstractBuildExecution#decideWorkspace(Node,WorkspaceList)}.
      *
      * @return
-     *      null if the workspace is on a slave that's not connected. Note that once the build is completed,
+     *      null if the workspace is on an agent that's not connected. Note that once the build is completed,
      *      the workspace may be used to build something else, so the value returned from this method may
      *      no longer show a workspace as it was used for this build.
      * @since 1.319
@@ -808,7 +808,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
 
         private void reportBrokenChannel(BuildListener listener) throws IOException {
             final Node node = getCurrentNode();
-            listener.hyperlink("/" + node.toComputer().getUrl() + "log", "Slave went offline during the build");
+            listener.hyperlink("/" + node.toComputer().getUrl() + "log", "Agent went offline during the build");
             listener.getLogger().println();
             final OfflineCause offlineCause = node.toComputer().getOfflineCause();
             if (offlineCause != null) {
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 86698156bf..d8b4851da9 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -269,7 +269,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
         final Jenkins j = Jenkins.getInstance();
         final List<Node> nodes = j != null ? j.getNodes() : null;
         if(nodes!=null && !nodes.isEmpty()) {
-            // if a new job is configured with Hudson that already has slave nodes
+            // if a new job is configured with Hudson that already has agent nodes
             // make it roamable by default
             canRoam = true;
         }
@@ -408,7 +408,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
     /**
      * Set of labels relevant to this job.
      *
-     * This method is used to determine what slaves are relevant to jobs, for example by {@link View}s.
+     * This method is used to determine what agents are relevant to jobs, for example by {@link View}s.
      * It does not affect the scheduling. This information is informational and the best-effort basis.
      *
      * @since 1.456
@@ -501,7 +501,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
      * Gets the directory where the module is checked out.
      *
      * @return
-     *      null if the workspace is on a slave that's not connected.
+     *      null if the workspace is on an agent that's not connected.
      * @deprecated as of 1.319
      *      To support concurrent builds of the same project, this method is moved to {@link AbstractBuild}.
      *      For backward compatibility, this method returns the right {@link AbstractBuild#getWorkspace()} if called
@@ -1395,7 +1395,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
                 // At this point we start thinking about triggering a build just to get a workspace,
                 // because otherwise there's no way we can detect changes.
                 // However, first there are some conditions in which we do not want to do so.
-                // give time for slaves to come online if we are right after reconnection (JENKINS-8408)
+                // give time for agents to come online if we are right after reconnection (JENKINS-8408)
                 long running = Jenkins.getInstance().getInjector().getInstance(Uptime.class).getUptime();
                 long remaining = TimeUnit2.MINUTES.toMillis(10)-running;
                 if (remaining>0 && /* this logic breaks tests of polling */!Functions.getIsUnitTest()) {
@@ -1404,7 +1404,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
                     return NO_CHANGES;
                 }
 
-                // Do not trigger build, if no suitable slave is online
+                // Do not trigger build, if no suitable agent is online
                 if (workspaceOfflineReason.equals(WorkspaceOfflineReason.all_suitable_nodes_are_offline)) {
                     // No suitable executor is online
                     listener.getLogger().print(Messages.AbstractProject_AwaitingWorkspaceToComeOnline(running/1000));
@@ -1415,7 +1415,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
                 Label label = getAssignedLabel();
                 if (label != null && label.isSelfLabel()) {
                     // if the build is fixed on a node, then attempting a build will do us
-                    // no good. We should just wait for the slave to come back.
+                    // no good. We should just wait for the agent to come back.
                     listener.getLogger().print(Messages.AbstractProject_NoWorkspace());
                     listener.getLogger().println( " (" + workspaceOfflineReason.name() + ")");
                     return NO_CHANGES;
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index c8e4204aa9..eebd99f3a5 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -284,7 +284,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     /**
-     * Directory where rotated slave logs are stored.
+     * Directory where rotated agent logs are stored.
      *
      * The method also creates a log directory if required.
      *
@@ -293,7 +293,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     protected @Nonnull File getLogDir() {
         File dir = new File(Jenkins.getInstance().getRootDir(),"logs/slaves/"+nodeName);
         if (!dir.exists() && !dir.mkdirs()) {
-            LOGGER.severe("Failed to create slave log directory " + dir.getAbsolutePath());
+            LOGGER.severe("Failed to create agent log directory " + dir.getAbsolutePath());
         }
         return dir;
     }
@@ -306,7 +306,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     /**
-     * Gets the string representation of the slave log.
+     * Gets the string representation of the agent log.
      */
     public String getLog() throws IOException {
         return Util.loadFile(getLogFile());
@@ -383,12 +383,12 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     public abstract Charset getDefaultCharset();
 
     /**
-     * Gets the logs recorded by this slave.
+     * Gets the logs recorded by this agent.
      */
     public abstract List<LogRecord> getLogRecords() throws IOException, InterruptedException;
 
     /**
-     * If {@link #getChannel()}==null, attempts to relaunch the slave agent.
+     * If {@link #getChannel()}==null, attempts to relaunch the agent.
      */
     public abstract void doLaunchSlaveAgent( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException;
 
@@ -619,8 +619,8 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     /**
-     * This method is called to determine whether manual launching of the slave is allowed at this point in time.
-     * @return {@code true} if manual launching of the slave is allowed at this point in time.
+     * This method is called to determine whether manual launching of the agent is allowed at this point in time.
+     * @return {@code true} if manual launching of the agent is allowed at this point in time.
      */
     @Exported
     public boolean isManualLaunchAllowed() {
@@ -648,8 +648,8 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      * Returns true if this computer can be launched by Hudson proactively and automatically.
      *
      * <p>
-     * For example, JNLP slaves return {@code false} from this, because the launch process
-     * needs to be initiated from the slave side.
+     * For example, JNLP agents return {@code false} from this, because the launch process
+     * needs to be initiated from the agent side.
      */
     @Exported
     public boolean isLaunchSupported() {
@@ -662,7 +662,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      * <p>
      * In contrast, {@link #isOffline()} represents the actual online/offline
      * state. For example, this method may return false while {@link #isOffline()}
-     * returns true if the slave agent failed to launch.
+     * returns true if the agent failed to launch.
      *
      * @deprecated
      *      You should almost always want {@link #isOffline()}.
@@ -1143,7 +1143,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     /**
-     * Gets the thread dump of the slave JVM.
+     * Gets the thread dump of the agent JVM.
      * @return
      *      key is the thread name, and the value is the pre-formatted dump.
      */
@@ -1162,14 +1162,14 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      * This method tries to compute the name of the host that's reachable by all the other nodes.
      *
      * <p>
-     * Since it's possible that the slave is not reachable from the master (it may be behind a firewall,
+     * Since it's possible that the agent is not reachable from the master (it may be behind a firewall,
      * connecting to master via JNLP), this method may return null.
      *
      * It's surprisingly tricky for a machine to know a name that other systems can get to,
      * especially between things like DNS search suffix, the hosts file, and YP.
      *
      * <p>
-     * So the technique here is to compute possible interfaces and names on the slave,
+     * So the technique here is to compute possible interfaces and names on the agent,
      * then try to ping them from the master, and pick the one that worked.
      *
      * <p>
@@ -1178,7 +1178,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      * @since 1.300
      * @return
      *      null if the host name cannot be computed (for example because this computer is offline,
-     *      because the slave is behind the firewall, etc.)
+     *      because the agent is behind the firewall, etc.)
      */
     public String getHostName() throws IOException, InterruptedException {
         if(hostNameCached)
@@ -1340,7 +1340,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
         if (vc instanceof Channel) {
             w.println("Master to slave");
             ((Channel)vc).dumpExportTable(w);
-            w.flush(); // flush here once so that even if the dump from the slave fails, the client gets some useful info
+            w.flush(); // flush here once so that even if the dump from the agent fails, the client gets some useful info
 
             w.println("\n\n\nSlave to master");
             w.print(vc.call(new DumpExportTableTask()));
@@ -1402,7 +1402,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
         Node result = node.reconfigure(req, req.getSubmittedForm());
         replaceBy(result);
 
-        // take the user back to the slave top page.
+        // take the user back to the agent top page.
         rsp.sendRedirect2("../" + result.getNodeName() + '/');
     }
 
@@ -1447,7 +1447,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
                 Node node = getNode();
                 int i  = (node != null) ? nodes.indexOf(node) : -1;
                 if(i<0) {
-                    throw new IOException("This slave appears to be removed while you were editing the configuration");
+                    throw new IOException("This agent appears to be removed while you were editing the configuration");
                 }
                 nodes.set(i, newNode);
                 app.setNodes(nodes);
@@ -1468,7 +1468,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     /**
-     * Really deletes the slave.
+     * Really deletes the agent.
      */
     @RequirePOST
     public HttpResponse doDoDelete() throws IOException {
@@ -1521,7 +1521,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     /**
-     * Returns {@code true} if the computer is accepting tasks. Needed to allow slaves programmatic suspension of task
+     * Returns {@code true} if the computer is accepting tasks. Needed to allow agents programmatic suspension of task
      * scheduling that does not overlap with being offline.
      *
      * @return {@code true} if the computer is accepting tasks
@@ -1539,7 +1539,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      */
     @CLIResolver
     public static Computer resolveForCLI(
-            @Argument(required=true,metaVar="NAME",usage="Slave name, or empty string for master") String name) throws CmdLineException {
+            @Argument(required=true,metaVar="NAME",usage="Agent name, or empty string for master") String name) throws CmdLineException {
         Jenkins h = Jenkins.getInstance();
         Computer item = h.getComputer(name);
         if (item==null) {
diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java
index f887167058..c5992c828f 100644
--- a/core/src/main/java/hudson/model/ComputerSet.java
+++ b/core/src/main/java/hudson/model/ComputerSet.java
@@ -137,7 +137,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
     }
 
     /**
-     * Gets all the slave names.
+     * Gets all the agent names.
      */
     public List<String> get_slaveNames() {
         return new AbstractList<String>() {
@@ -229,7 +229,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
     }
 
     /**
-     * First check point in creating a new slave.
+     * First check point in creating a new agent.
      */
     public synchronized void doCreateItem( StaplerRequest req, StaplerResponse rsp,
                                            @QueryParameter String name, @QueryParameter String mode,
@@ -278,7 +278,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
     }
 
     /**
-     * Really creates a new slave.
+     * Really creates a new agent.
      */
     public synchronized void doDoCreateItem( StaplerRequest req, StaplerResponse rsp,
                                            @QueryParameter String name,
@@ -295,12 +295,12 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
         Node result = NodeDescriptor.all().find(type).newInstance(req, formData);
         app.addNode(result);
 
-        // take the user back to the slave list top page
+        // take the user back to the agent list top page
         rsp.sendRedirect2(".");
     }
 
     /**
-     * Makes sure that the given name is good as a slave name.
+     * Makes sure that the given name is good as an agent name.
      * @return trimmed name if valid; throws ParseException if not
      */
     public String checkName(String name) throws Failure {
@@ -318,7 +318,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
     }
 
     /**
-     * Makes sure that the given name is good as a slave name.
+     * Makes sure that the given name is good as an agent name.
      */
     public FormValidation doCheckName(@QueryParameter String value) throws IOException, ServletException {
         Jenkins.getInstance().checkPermission(Computer.CREATE);
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 2160d27b17..2a0295040c 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -36,6 +36,8 @@ import hudson.util.FormValidation.CheckMethod;
 import hudson.util.ReflectionUtils;
 import hudson.util.ReflectionUtils.Parameter;
 import hudson.views.ListViewColumn;
+import jenkins.model.GlobalConfiguration;
+import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -807,7 +809,18 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable {
     public String getGlobalConfigPage() {
         return getViewPage(clazz, getPossibleViewNames("global"), null);
     }
-    
+
+    /**
+     * Define the global configuration category the global config of this Descriptor is in.
+     *
+     * @return never null, always the same value for a given instance of {@link Descriptor}.
+     *
+     * @since TODO, used to be in {@link GlobalConfiguration} before that.
+     */
+    public GlobalConfigurationCategory getCategory() {
+        return GlobalConfigurationCategory.get(GlobalConfigurationCategory.Unclassified.class);
+    }
+
     private String getViewPage(Class<?> clazz, String pageName, String defaultValue) {
         return getViewPage(clazz,Collections.singleton(pageName),defaultValue);
     }
diff --git a/core/src/main/java/hudson/model/FreeStyleProject.java b/core/src/main/java/hudson/model/FreeStyleProject.java
index 8ba9672ee8..451c13ae1d 100644
--- a/core/src/main/java/hudson/model/FreeStyleProject.java
+++ b/core/src/main/java/hudson/model/FreeStyleProject.java
@@ -25,6 +25,7 @@ package hudson.model;
 
 import hudson.Extension;
 import jenkins.model.Jenkins;
+import jenkins.model.item_category.StandaloneProjectsCategory;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -65,6 +66,7 @@ public class FreeStyleProject extends Project<FreeStyleProject,FreeStyleBuild> i
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
 
     public static final class DescriptorImpl extends AbstractProjectDescriptor {
+
         public String getDisplayName() {
             return Messages.FreeStyleProject_DisplayName();
         }
@@ -72,5 +74,21 @@ public class FreeStyleProject extends Project<FreeStyleProject,FreeStyleBuild> i
         public FreeStyleProject newInstance(ItemGroup parent, String name) {
             return new FreeStyleProject(parent,name);
         }
+
+        @Override
+        public String getDescription() {
+            return Messages.FreeStyleProject_Description();
+        }
+
+        @Override
+        public String getCategoryId() {
+            return StandaloneProjectsCategory.ID;
+        }
+
+        @Override
+        public String getIconFilePathPattern() {
+            return (Jenkins.RESOURCE_PATH + "/images/:size/freestyleproject.png").replaceFirst("^/", "");
+        }
+
     }
 }
diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java
index f41cae8299..02b9d949a8 100644
--- a/core/src/main/java/hudson/model/Hudson.java
+++ b/core/src/main/java/hudson/model/Hudson.java
@@ -108,7 +108,7 @@ public class Hudson extends Jenkins {
     }
 
     /**
-     * Gets the slave node of the give name, hooked under this Hudson.
+     * Gets the agent of the give name, hooked under this Hudson.
      *
      * @deprecated
      *      Use {@link #getNode(String)}. Since 1.252.
@@ -131,7 +131,7 @@ public class Hudson extends Jenkins {
     }
 
     /**
-     * Updates the slave list.
+     * Updates the agent list.
      *
      * @deprecated
      *      Use {@link #setNodes(List)}. Since 1.252.
diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java
index 15c1283743..1670a5ac8b 100644
--- a/core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -137,7 +137,7 @@ public abstract class ItemGroupMixIn {
     };
 
     /**
-     * Creates a {@link TopLevelItem} from the submission of the '/lib/hudson/newFromList/formList'
+     * Creates a {@link TopLevelItem} for example from the submission of the {@code /lib/hudson/newFromList/form} tag
      * or throws an exception if it fails.
      */
     public synchronized TopLevelItem createTopLevelItem( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
@@ -170,12 +170,7 @@ public abstract class ItemGroupMixIn {
             String from = req.getParameter("from");
 
             // resolve a name to Item
-            Item src = null;
-            if (!from.startsWith("/"))
-                src = parent.getItem(from);
-            if (src==null)
-                src = Jenkins.getInstance().getItemByFullName(from);
-
+            Item src = Jenkins.getInstance().getItem(from, parent);
             if(src==null) {
                 if(Util.fixEmpty(from)==null)
                     throw new Failure("Specify which job to copy");
diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java
index ff32c1f940..74a9fa6901 100644
--- a/core/src/main/java/hudson/model/Label.java
+++ b/core/src/main/java/hudson/model/Label.java
@@ -237,8 +237,8 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
      * <p>
      * The answer is yes if there is a reasonable basis to believe that Hudson can have
      * an executor under this label, given the current configuration. This includes
-     * situations such as (1) there are offline slaves that have this label (2) clouds exist
-     * that can provision slaves that have this label.
+     * situations such as (1) there are offline agents that have this label (2) clouds exist
+     * that can provision agents that have this label.
      */
     public boolean isAssignable() {
         for (Node n : getNodes())
diff --git a/core/src/main/java/hudson/model/LoadStatistics.java b/core/src/main/java/hudson/model/LoadStatistics.java
index cd72f87b7a..f185715654 100644
--- a/core/src/main/java/hudson/model/LoadStatistics.java
+++ b/core/src/main/java/hudson/model/LoadStatistics.java
@@ -390,7 +390,7 @@ public abstract class LoadStatistics {
             Jenkins j = Jenkins.getInstance();
             List<Queue.BuildableItem> bis = j.getQueue().getBuildableItems();
 
-            // update statistics on slaves
+            // update statistics on agents
             for( Label l : j.getLabels() ) {
                 l.loadStatistics.updateCounts(l.loadStatistics.computeSnapshot(bis));
             }
@@ -421,7 +421,7 @@ public abstract class LoadStatistics {
         private static final long serialVersionUID = 1L;
 
         /**
-         * The total number of executors that Jenkins currently knows, this includes all off-line slaves.
+         * The total number of executors that Jenkins currently knows, this includes all off-line agents.
          */
         private final int definedExecutors;
         /**
@@ -467,7 +467,7 @@ public abstract class LoadStatistics {
         }
 
         /**
-          * The total number of executors that Jenkins currently knows, this includes all off-line slaves.
+          * The total number of executors that Jenkins currently knows, this includes all off-line agents.
           */
         @Exported
         public int getDefinedExecutors() {
diff --git a/core/src/main/java/hudson/model/ManageJenkinsAction.java b/core/src/main/java/hudson/model/ManageJenkinsAction.java
index a4b813a852..41fff84496 100644
--- a/core/src/main/java/hudson/model/ManageJenkinsAction.java
+++ b/core/src/main/java/hudson/model/ManageJenkinsAction.java
@@ -35,7 +35,7 @@ import jenkins.model.Jenkins;
 public class ManageJenkinsAction implements RootAction {
     public String getIconFileName() {
         if (Jenkins.getInstance().hasPermission(Jenkins.ADMINISTER))
-            return "setting.png";
+            return "gear2.png";
         else
             return null;
     }
diff --git a/core/src/main/java/hudson/model/Node.java b/core/src/main/java/hudson/model/Node.java
index 3ada256d0a..d7c4071428 100644
--- a/core/src/main/java/hudson/model/Node.java
+++ b/core/src/main/java/hudson/model/Node.java
@@ -72,7 +72,7 @@ import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
 /**
- * Base type of Jenkins slaves (although in practice, you probably extend {@link Slave} to define a new slave type).
+ * Base type of Jenkins agents (although in practice, you probably extend {@link Slave} to define a new agent type).
  *
  * <p>
  * As a special case, {@link Jenkins} extends from here.
@@ -83,7 +83,7 @@ import org.kohsuke.stapler.export.ExportedBean;
  *
  * <p>
  * There is no URL binding for {@link Node}. {@link Computer} and {@link TransientComputerActionFactory} must
- * be used to associate new {@link Action}s to slaves.
+ * be used to associate new {@link Action}s to agents.
  *
  * @author Kohsuke Kawaguchi
  * @see NodeDescriptor
@@ -95,7 +95,7 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
     private static final Logger LOGGER = Logger.getLogger(Node.class.getName());
 
     /**
-     * Newly copied slaves get this flag set, so that Jenkins doesn't try to start/remove this node until its configuration
+     * Newly copied agents get this flag set, so that Jenkins doesn't try to start/remove this node until its configuration
      * is saved once.
      */
     protected volatile transient boolean holdOffLaunchUntilSave;
@@ -219,7 +219,7 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
     protected abstract Computer createComputer();
 
     /**
-     * Returns {@code true} if the node is accepting tasks. Needed to allow slaves programmatic suspension of task
+     * Returns {@code true} if the node is accepting tasks. Needed to allow agents programmatic suspension of task
      * scheduling that does not overlap with being offline. Called by {@link Computer#isAcceptingTasks()}.
      * This method is distinct from {@link Computer#isAcceptingTasks()} as sometimes the {@link Node} concrete
      * class may not have control over the {@link hudson.model.Computer} concrete class associated with it.
@@ -284,7 +284,7 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
      * {@link LabelFinder} extension point.
      *
      * This method has a side effect of updating the hudson-wide set of labels
-     * and should be called after events that will change that - e.g. a slave
+     * and should be called after events that will change that - e.g. a agent
      * connecting.
      */
     @Exported
@@ -502,7 +502,7 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
     public abstract NodeDescriptor getDescriptor();
 
     /**
-     * Estimates the clock difference with this slave.
+     * Estimates the clock difference with this agent.
      *
      * @return
      *      always non-null.
@@ -527,7 +527,7 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
     public abstract Callable<ClockDifference,IOException> getClockDifferenceCallable();
 
     /**
-     * Constants that control how Hudson allocates jobs to slaves.
+     * Constants that control how Hudson allocates jobs to agents.
      */
     public enum Mode {
         NORMAL(Messages._Node_Mode_NORMAL()),
diff --git a/core/src/main/java/hudson/model/OverallLoadStatistics.java b/core/src/main/java/hudson/model/OverallLoadStatistics.java
index 0f10e12ae8..e95174d0ca 100644
--- a/core/src/main/java/hudson/model/OverallLoadStatistics.java
+++ b/core/src/main/java/hudson/model/OverallLoadStatistics.java
@@ -32,7 +32,7 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.export.Exported;
 
 /**
- * {@link LoadStatistics} for the entire system (the master and all the slaves combined),
+ * {@link LoadStatistics} for the entire system (the master and all the agents combined),
  * and all the jobs that are running on it.
  *
  * @author Kohsuke Kawaguchi
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 7d1414ad5e..42803389c0 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -2484,7 +2484,7 @@ public class Queue extends ResourceController implements Saveable {
             Label label = getAssignedLabel();
             List<Node> allNodes = jenkins.getNodes();
             if (allNodes.isEmpty())
-                label = null;    // no master/slave. pointless to talk about nodes
+                label = null;    // no master/agent. pointless to talk about nodes
 
             if (label != null) {
                 Set<Node> nodes = label.getNodes();
diff --git a/core/src/main/java/hudson/model/Result.java b/core/src/main/java/hudson/model/Result.java
index 02e71f3ff3..8b1d05fc4b 100644
--- a/core/src/main/java/hudson/model/Result.java
+++ b/core/src/main/java/hudson/model/Result.java
@@ -161,7 +161,7 @@ public final class Result implements Serializable, CustomExportedBean {
         return l;
     }
 
-    // Maintain each Result as a singleton deserialized (like build result from a slave node)
+    // Maintain each Result as a singleton deserialized (like build result from an agent node)
     private Object readResolve() {
         for (Result r : all)
             if (ordinal==r.ordinal)
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index b1ebf3b40a..7c5aba4be5 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -624,7 +624,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
     /**
      * When the build has started running in an executor.
      *
-     * For example, if a build is scheduled 1pm, and stayed in the queue for 1 hour (say, no idle slaves),
+     * For example, if a build is scheduled 1pm, and stayed in the queue for 1 hour (say, no idle agents),
      * then this method returns 2pm, which is the time the job moved from the queue to the building state.
      *
      * @see #getTimestamp()
diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index d9dcf85a77..38de3e02c1 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -73,7 +73,7 @@ import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
 /**
- * Information about a Hudson slave node.
+ * Information about a Hudson agent node.
  *
  * <p>
  * Ideally this would have been in the <tt>hudson.slaves</tt> package,
@@ -81,12 +81,17 @@ import org.kohsuke.stapler.StaplerResponse;
  *
  * <p>
  * TODO: move out more stuff to {@link DumbSlave}.
+ * 
+ * On Febrary, 2016 a general renaming was done internally: the "slave" term was replaced by
+ * "Agent". This change was applied in: UI labels/HTML pages, javadocs and log messages.
+ * Java classes, fields, methods, etc were not renamed to avoid compatibility issues.
+ * See <a href="https://issues.jenkins-ci.org/browse/JENKINS-27268">JENKINS-27268</a>.
  *
  * @author Kohsuke Kawaguchi
  */
 public abstract class Slave extends Node implements Serializable {
     /**
-     * Name of this slave node.
+     * Name of this agent node.
      */
     protected String name;
 
@@ -116,12 +121,12 @@ public abstract class Slave extends Node implements Serializable {
     private Mode mode;
 
     /**
-     * Slave availablility strategy.
+     * Agent availablility strategy.
      */
     private RetentionStrategy retentionStrategy;
 
     /**
-     * The starter that will startup this slave.
+     * The starter that will startup this agent.
      */
     private ComputerLauncher launcher;
 
@@ -139,7 +144,7 @@ public abstract class Slave extends Node implements Serializable {
     private transient volatile Set<Label> labels;
 
     /**
-     * Id of user which creates this slave {@link User}.
+     * Id of user which creates this agent {@link User}.
      */
     private String userId;
 
@@ -173,7 +178,7 @@ public abstract class Slave extends Node implements Serializable {
          Slave node = (Slave) Jenkins.getInstance().getNode(name);
 
        if(node!=null){
-            this.userId= node.getUserId(); //slave has already existed
+            this.userId= node.getUserId(); //agent has already existed
         }
        else{
             User user = User.current();
@@ -190,7 +195,7 @@ public abstract class Slave extends Node implements Serializable {
     }
 
     /**
-     * Return id of user which created this slave
+     * Return id of user which created this agent
      *
      * @return id of user
      */
@@ -300,7 +305,7 @@ public abstract class Slave extends Node implements Serializable {
     }
 
     /**
-     * Root directory on this slave where all the job workspaces are laid out.
+     * Root directory on this agent where all the job workspaces are laid out.
      * @return
      *      null if not connected.
      */
@@ -372,7 +377,7 @@ public abstract class Slave extends Node implements Serializable {
     }
 
     /**
-     * Creates a launcher for the slave.
+     * Creates a launcher for the agent.
      *
      * @return
      *      If there is no computer it will return a {@link hudson.Launcher.DummyLauncher}, otherwise it
@@ -381,7 +386,7 @@ public abstract class Slave extends Node implements Serializable {
     public Launcher createLauncher(TaskListener listener) {
         SlaveComputer c = getComputer();
         if (c == null) {
-            listener.error("Issue with creating launcher for slave " + name + ".");
+            listener.error("Issue with creating launcher for agent " + name + ".");
             return new Launcher.DummyLauncher(listener);
         } else {
             return new RemoteLauncher(listener, c.getChannel(), c.isUnix()).decorateFor(this);
@@ -438,7 +443,7 @@ public abstract class Slave extends Node implements Serializable {
         }
 
         /**
-         * Performs syntactical check on the remote FS for slaves.
+         * Performs syntactical check on the remote FS for agents.
          */
         public FormValidation doCheckRemoteFS(@QueryParameter String value) throws IOException, ServletException {
             if(Util.fixEmptyAndTrim(value)==null)
diff --git a/core/src/main/java/hudson/model/TaskListener.java b/core/src/main/java/hudson/model/TaskListener.java
index 3ff26c0fff..957e3367d8 100644
--- a/core/src/main/java/hudson/model/TaskListener.java
+++ b/core/src/main/java/hudson/model/TaskListener.java
@@ -37,7 +37,7 @@ import java.io.Serializable;
 /**
  * Receives events that happen during some lengthy operation
  * that has some chance of failures, such as a build, SCM change polling,
- * slave launch, and so on.
+ * agent launch, and so on.
  *
  * <p>
  * This interface is implemented by Hudson core and passed to extension points so that
diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
index 272c609c2b..e72b2fb108 100644
--- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
+++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
@@ -25,8 +25,23 @@ package hudson.model;
 
 import hudson.ExtensionList;
 import jenkins.model.Jenkins;
+import jenkins.model.item_category.ItemCategory;
 import org.acegisecurity.AccessDeniedException;
+import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.XMLOutput;
+import org.apache.commons.lang.StringUtils;
+import org.kohsuke.stapler.MetaClass;
+import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.WebApp;
+import org.kohsuke.stapler.jelly.DefaultScriptInvoker;
+import org.kohsuke.stapler.jelly.JellyClassTearOff;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import java.io.StringWriter;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * {@link Descriptor} for {@link TopLevelItem}s.
@@ -34,6 +49,9 @@ import org.kohsuke.stapler.StaplerRequest;
  * @author Kohsuke Kawaguchi
  */
 public abstract class TopLevelItemDescriptor extends Descriptor<TopLevelItem> {
+
+    static final Logger LOGGER = Logger.getLogger(TopLevelItemDescriptor.class.getName());
+
     protected TopLevelItemDescriptor(Class<? extends TopLevelItem> clazz) {
         super(clazz);
     }
@@ -113,6 +131,87 @@ public abstract class TopLevelItemDescriptor extends Descriptor<TopLevelItem> {
         return super.getDisplayName();
     }
 
+    /**
+     * A description of this kind of item type. This description can contain HTML code but it is recommend to use text plain
+     * in order to avoid how it should be represented.
+     *
+     * This method should be called in a thread where Stapler is associated, but it will return an empty string.
+     *
+     * @return A string, by default the value from newInstanceDetail view is taken.
+     *
+     * @since TODO
+     */
+    @Nonnull
+    public String getDescription() {
+        Stapler stapler = Stapler.getCurrent();
+        if (stapler != null) {
+            try {
+                WebApp webapp = WebApp.getCurrent();
+                MetaClass meta = webapp.getMetaClass(this);
+                Script s = meta.loadTearOff(JellyClassTearOff.class).findScript("newInstanceDetail");
+                if (s == null) {
+                    return "";
+                }
+                DefaultScriptInvoker dsi = new DefaultScriptInvoker();
+                StringWriter sw = new StringWriter();
+                XMLOutput xml = dsi.createXMLOutput(sw, true);
+                dsi.invokeScript(Stapler.getCurrentRequest(), Stapler.getCurrentResponse(), s, this, xml);
+                return sw.toString();
+            } catch (Exception e) {
+                LOGGER.log(Level.WARNING, null, e);
+                return "";
+            }
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * Used to categorize this kind of item type. @see {@link ItemCategory}
+     *
+     * @return A string with the category identifier, {@link ItemCategory.UncategorizedCategory#getId()} by default.
+     *
+     * @since TODO
+     */
+    @Nonnull
+    public String getCategoryId() {
+        return ItemCategory.UncategorizedCategory.ID;
+    }
+
+    /**
+     * Represents a file path pattern to get the Item icon in different sizes.
+     *
+     * For example: plugin/plugin-shortname/images/:size/item.png, where {@code :size} represents the different
+     * icon sizes used commonly in Jenkins project: 16x16, 24x24, 32x32 or 48x48
+     *
+     * @see {@link FreeStyleProject.DescriptorImpl#getIconFilePathPattern()}
+     *
+     * @return A string or null if it is not defined.
+     *
+     * @since TODO
+     */
+    @CheckForNull
+    public String getIconFilePathPattern() {
+        return null;
+    }
+
+    /**
+     * An icon file path associated to a specific size.
+     *
+     * @param size A string with values that represent the common sizes: 16x16, 24x24, 32x32 or 48x48
+     *
+     * @return A string or null if it is not defined.
+     *
+     * @since TODO
+     */
+    @CheckForNull
+    public String getIconFilePath(String size) {
+        if (!StringUtils.isBlank(getIconFilePathPattern())) {
+            return getIconFilePathPattern().replace(":size", size);
+        }
+        return null;
+    }
+
     /**
      * @deprecated since 2007-01-19.
      *      This is not a valid operation for {@link Item}s.
diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index b5fde8aac6..ceddcb0b20 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -33,6 +33,9 @@ import hudson.ProxyConfiguration;
 import hudson.Util;
 import hudson.XmlFile;
 import static hudson.init.InitMilestone.PLUGINS_STARTED;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+
 import hudson.init.Initializer;
 import hudson.lifecycle.Lifecycle;
 import hudson.lifecycle.RestartNotSupportedException;
@@ -50,14 +53,18 @@ import hudson.util.IOUtils;
 import hudson.util.PersistedList;
 import hudson.util.XStream2;
 import jenkins.RestartRequiredException;
+import jenkins.install.InstallUtil;
 import jenkins.model.Jenkins;
 import jenkins.util.io.OnMaster;
+import net.sf.json.JSONObject;
+
 import org.acegisecurity.Authentication;
 import org.acegisecurity.context.SecurityContext;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.input.CountingInputStream;
 import org.apache.commons.io.output.NullOutputStream;
 import org.jvnet.localizer.Localizable;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -66,27 +73,30 @@ import javax.annotation.Nonnull;
 import javax.net.ssl.SSLHandshakeException;
 import javax.servlet.ServletException;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.HttpRetryException;
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.UnknownHostException;
-import java.security.DigestInputStream;
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.UUID;
 import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -122,7 +132,7 @@ import org.kohsuke.stapler.interceptor.RequirePOST;
  */
 @ExportedBean
 public class UpdateCenter extends AbstractModelObject implements Saveable, OnMaster {
-	
+
     private static final String UPDATE_CENTER_URL = System.getProperty(UpdateCenter.class.getName()+".updateCenterUrl","http://updates.jenkins-ci.org/");
 
     /**
@@ -133,7 +143,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
 
     @Restricted(NoExternalUse.class)
     public static final String ID_UPLOAD = "_upload";
-	
+
     /**
      * {@link ExecutorService} that performs installation.
      * @since 1.501
@@ -146,7 +156,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
      */
     protected final ExecutorService updateService = Executors.newCachedThreadPool(
         new NamingThreadFactory(new DaemonThreadFactory(), "Update site data downloader"));
-        
+
     /**
      * List of created {@link UpdateCenterJob}s. Access needs to be synchronized.
      */
@@ -170,10 +180,44 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
 
     private boolean requiresRestart;
 
+    /**
+     * Simple connection status enum.
+     */
+    @Restricted(NoExternalUse.class)
+    static enum ConnectionStatus {
+        /**
+         * Connection status has not started yet.
+         */
+        PRECHECK,
+        /**
+         * Connection status is being checked at this time.
+         */
+        CHECKING,
+        /**
+         * Connection status was not checked.
+         */
+        UNCHECKED,
+        /**
+         * Connection is ok.
+         */
+        OK,
+        /**
+         * Connection status check failed.
+         */
+        FAILED;
+
+        static final String INTERNET = "internet";
+        static final String UPDATE_SITE = "updatesite";
+    }
+
     public UpdateCenter() {
         configure(new UpdateCenterConfiguration());
     }
 
+    UpdateCenter(@Nonnull UpdateCenterConfiguration configuration) {
+        configure(configuration);
+    }
+
     public Api getApi() {
         return new Api(this);
     }
@@ -236,6 +280,144 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
         return null;
     }
 
+    /**
+     * Get the current connection status.
+     * <p>
+     * Supports a "siteId" request parameter, defaulting to "default" for the default
+     * update site.
+     *
+     * @return The current connection status.
+     */
+    @Restricted(DoNotUse.class)
+    public HttpResponse doConnectionStatus(StaplerRequest request) {
+        try {
+            String siteId = request.getParameter("siteId");
+            if (siteId == null) {
+                siteId = ID_DEFAULT;
+            }
+            ConnectionCheckJob checkJob = getConnectionCheckJob(siteId);
+            if (checkJob == null) {
+                UpdateSite site = getSite(siteId);
+                if (site != null) {
+                    checkJob = addConnectionCheckJob(site);
+                }
+            }
+            if (checkJob != null) {
+                boolean isOffline = false;
+                for (ConnectionStatus status : checkJob.connectionStates.values()) {
+                    if(ConnectionStatus.FAILED.equals(status)) {
+                        isOffline = true;
+                        break;
+                    }
+                }
+                if (isOffline) {
+                    // retry connection states if determined to be offline
+                    checkJob.run();
+                    isOffline = false;
+                    for (ConnectionStatus status : checkJob.connectionStates.values()) {
+                        if(ConnectionStatus.FAILED.equals(status)) {
+                            isOffline = true;
+                            break;
+                        }
+                    }
+                    if(!isOffline) { // also need to download the metadata
+                        updateAllSites();
+                    }
+                }
+                return HttpResponses.okJSON(checkJob.connectionStates);
+            } else {
+                return HttpResponses.errorJSON(String.format("Unknown site '%s'.", siteId));
+            }
+        } catch (Exception e) {
+            return HttpResponses.errorJSON(String.format("ERROR: %s", e.getMessage()));
+        }
+    }
+
+    /**
+     * Called to determine if there was an incomplete installation, what the statuses of the plugins are
+     */
+    @Restricted(DoNotUse.class) // WebOnly
+    public HttpResponse doIncompleteInstallStatus() {
+        try {
+        Map<String,String> jobs = InstallUtil.getPersistedInstallStatus();
+        if(jobs == null) {
+            jobs = Collections.emptyMap();
+        }
+            return HttpResponses.okJSON(jobs);
+        } catch (Exception e) {
+            return HttpResponses.errorJSON(String.format("ERROR: %s", e.getMessage()));
+        }
+    }
+
+    /**
+     * Called to persist the currently installing plugin states. This allows
+     * us to support install resume if Jenkins is restarted while plugins are
+     * being installed.
+     */
+    public synchronized void persistInstallStatus() {
+        List<UpdateCenterJob> jobs = getJobs();
+
+        boolean activeInstalls = false;
+        for (UpdateCenterJob job : jobs) {
+            if (job instanceof InstallationJob) {
+                InstallationJob installationJob = (InstallationJob) job;
+                if(!installationJob.status.isSuccess()) {
+            activeInstalls = true;
+                }
+            }
+        }
+
+        if(activeInstalls) {
+        InstallUtil.persistInstallStatus(jobs); // save this info
+        }
+        else {
+        InstallUtil.clearInstallStatus(); // clear this info
+        }
+    }
+
+    /**
+     * Get the current installation status of a plugin set.
+     * <p>
+     * Supports a "correlationId" request parameter if you only want to get the
+     * install status of a set of plugins requested for install through
+     * {@link PluginManager#doInstallPlugins(org.kohsuke.stapler.StaplerRequest)}.
+     *
+     * @return The current installation status of a plugin set.
+     */
+    @Restricted(DoNotUse.class)
+    public HttpResponse doInstallStatus(StaplerRequest request) {
+        try {
+            String correlationId = request.getParameter("correlationId");
+            Map<String,Object> response = new HashMap<>();
+            response.put("state", Jenkins.getInstance().getInstallState().name());
+            List<Map<String, String>> installStates = new ArrayList<>();
+            response.put("jobs", installStates);
+            List<UpdateCenterJob> jobCopy = getJobs();
+
+            for (UpdateCenterJob job : jobCopy) {
+                if (job instanceof InstallationJob) {
+                    UUID jobCorrelationId = job.getCorrelationId();
+                    if (correlationId == null || (jobCorrelationId != null && correlationId.equals(jobCorrelationId.toString()))) {
+                        InstallationJob installationJob = (InstallationJob) job;
+                        Map<String, String> pluginInfo = new LinkedHashMap<>();
+                        pluginInfo.put("name", installationJob.plugin.name);
+                        pluginInfo.put("version", installationJob.plugin.version);
+                        pluginInfo.put("title", installationJob.plugin.title);
+                        pluginInfo.put("installStatus", installationJob.status.getType());
+                        pluginInfo.put("requiresRestart", Boolean.toString(installationJob.status.requiresRestart()));
+                        if (jobCorrelationId != null) {
+                            pluginInfo.put("correlationId", jobCorrelationId.toString());
+                        }
+                        installStates.add(pluginInfo);
+                    }
+                }
+            }
+            return HttpResponses.okJSON(JSONObject.fromObject(response));
+        } catch (Exception e) {
+            return HttpResponses.errorJSON(String.format("ERROR: %s", e.getMessage()));
+        }
+    }
+
     /**
      * Returns latest Jenkins upgrade job.
      * @return HudsonUpgradeJob or null if not found
@@ -388,7 +570,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
         }
         response.sendRedirect2(".");
     }
-    
+
     /**
      * Cancel all scheduled jenkins restarts
      */
@@ -497,12 +679,60 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
     }
 
     /*package*/ synchronized Future<UpdateCenterJob> addJob(UpdateCenterJob job) {
-        // the first job is always the connectivity check
-        if (sourcesUsed.add(job.site))
-            new ConnectionCheckJob(job.site).submit();
+        addConnectionCheckJob(job.site);
         return job.submit();
     }
 
+    private @Nonnull ConnectionCheckJob addConnectionCheckJob(@Nonnull UpdateSite site) {
+        // Create a connection check job if the site was not already in the sourcesUsed set i.e. the first
+        // job (in the jobs list) relating to a site must be the connection check job.
+        if (sourcesUsed.add(site)) {
+            ConnectionCheckJob connectionCheckJob = newConnectionCheckJob(site);
+            connectionCheckJob.submit();
+            return connectionCheckJob;
+        } else {
+            // Find the existing connection check job for that site and return it.
+            ConnectionCheckJob connectionCheckJob = getConnectionCheckJob(site);
+            if (connectionCheckJob != null) {
+                return connectionCheckJob;
+            } else {
+                throw new IllegalStateException("Illegal addition of an UpdateCenter job without calling UpdateCenter.addJob. " +
+                        "No ConnectionCheckJob found for the site.");
+            }
+        }
+    }
+
+    /**
+     * Create a {@link ConnectionCheckJob} for the specified update site.
+     * <p>
+     * Does not start/submit the job.
+     * @param site The site  for which the Job is to be created.
+     * @return A {@link ConnectionCheckJob} for the specified update site.
+     */
+    @Restricted(NoExternalUse.class)
+    ConnectionCheckJob newConnectionCheckJob(UpdateSite site) {
+        return new ConnectionCheckJob(site);
+    }
+
+    private @CheckForNull ConnectionCheckJob getConnectionCheckJob(@Nonnull String siteId) {
+        UpdateSite site = getSite(siteId);
+        if (site == null) {
+            return null;
+        }
+        return getConnectionCheckJob(site);
+    }
+
+    private @CheckForNull ConnectionCheckJob getConnectionCheckJob(@Nonnull UpdateSite site) {
+        synchronized (jobs) {
+            for (UpdateCenterJob job : jobs) {
+                if (job instanceof ConnectionCheckJob && job.site.getId().equals(site.getId())) {
+                    return (ConnectionCheckJob) job;
+                }
+            }
+        }
+        return null;
+    }
+
     public String getDisplayName() {
         return "Update center";
     }
@@ -558,6 +788,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
                                     UpdateCenter.class.getName()+".xml"));
     }
 
+    @Exported
     public List<Plugin> getAvailables() {
         Map<String,Plugin> pluginMap = new LinkedHashMap<String, Plugin>();
         for (UpdateSite site : sites) {
@@ -626,16 +857,16 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
 
         return new ArrayList<Plugin>(pluginMap.values());
     }
-    
+
     /**
      * Ensure that all UpdateSites are up to date, without requiring a user to
      * browse to the instance.
-     * 
+     *
      * @return a list of {@link FormValidation} for each updated Update Site
-     * @throws ExecutionException 
-     * @throws InterruptedException 
+     * @throws ExecutionException
+     * @throws InterruptedException
      * @since 1.501
-     * 
+     *
      */
     public List<FormValidation> updateAllSites() throws InterruptedException, ExecutionException {
         List <Future<FormValidation>> futures = new ArrayList<Future<FormValidation>>();
@@ -645,8 +876,8 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
                 futures.add(future);
             }
         }
-        
-        List<FormValidation> results = new ArrayList<FormValidation>(); 
+
+        List<FormValidation> results = new ArrayList<FormValidation>();
         for (Future<FormValidation> f : futures) {
             results.add(f.get());
         }
@@ -902,7 +1133,16 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
 
         private void testConnection(URL url) throws IOException {
             try {
-                Util.copyStreamAndClose(ProxyConfiguration.open(url).getInputStream(),new NullOutputStream());
+                URLConnection connection = (URLConnection) ProxyConfiguration.open(url);
+
+                if(connection instanceof HttpURLConnection) {
+                    int responseCode = ((HttpURLConnection)connection).getResponseCode();
+                    if(HttpURLConnection.HTTP_OK != responseCode) {
+                        throw new HttpRetryException("Invalid response code (" + responseCode + ") from URL: " + url, responseCode);
+                    }
+                } else {
+                    Util.copyStreamAndClose(connection.getInputStream(),new NullOutputStream());
+                }
             } catch (SSLHandshakeException e) {
                 if (e.getMessage().contains("PKIX path building failed"))
                    // fix up this crappy error message from JDK
@@ -931,6 +1171,12 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
          */
         public final UpdateSite site;
 
+        /**
+         * Simple correlation ID that can be used to associated a batch of jobs e.g. the
+         * installation of a set of plugins.
+         */
+        private UUID correlationId = null;
+
         /**
          * If this job fails, set to the error.
          */
@@ -944,6 +1190,17 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
             return new Api(this);
         }
 
+        public UUID getCorrelationId() {
+            return correlationId;
+        }
+
+        public void setCorrelationId(UUID correlationId) {
+            if (this.correlationId != null) {
+                throw new IllegalStateException("Illegal call to set the 'correlationId'. Already set.");
+            }
+            this.correlationId = correlationId;
+        }
+
         /**
          * @deprecated as of 1.326
          *      Use {@link #submit()} instead.
@@ -965,6 +1222,8 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
          */
         public Future<UpdateCenterJob> submit() {
             LOGGER.fine("Scheduling "+this+" to installerService");
+            // TODO: seems like this access to jobs should be synchronized, no?
+            // It might get synch'd accidentally via the addJob method, but that wouldn't be good.
             jobs.add(this);
             return installerService.submit(this,this);
         }
@@ -973,7 +1232,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
         public String getErrorMessage() {
             return error != null ? error.getMessage() : null;
         }
-        
+
         public Throwable getError() {
             return error;
         }
@@ -988,10 +1247,10 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
          */
          @Exported(inline=true)
         public volatile RestartJenkinsJobStatus status = new Pending();
-        
+
         /**
          * Cancel job
-         */     
+         */
         public synchronized boolean cancel() {
             if (status instanceof Pending) {
                 status = new Canceled();
@@ -999,7 +1258,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
             }
             return false;
         }
-        
+
         public RestartJenkinsJob(UpdateSite site) {
             super(site);
         }
@@ -1022,26 +1281,26 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
         public abstract class RestartJenkinsJobStatus {
             @Exported
             public final int id = iota.incrementAndGet();
-   
+
         }
-        
+
         public class Pending extends RestartJenkinsJobStatus {
             @Exported
             public String getType() {
                 return getClass().getSimpleName();
             }
         }
-        
+
         public class Running extends RestartJenkinsJobStatus {
-            
+
         }
-        
+
         public class Failure extends RestartJenkinsJobStatus {
-            
+
         }
-        
+
         public class Canceled extends RestartJenkinsJobStatus {
-            
+
         }
     }
 
@@ -1051,42 +1310,72 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
     public final class ConnectionCheckJob extends UpdateCenterJob {
         private final Vector<String> statuses= new Vector<String>();
 
+        final Map<String, ConnectionStatus> connectionStates = new ConcurrentHashMap<>();
+
         public ConnectionCheckJob(UpdateSite site) {
             super(site);
+            connectionStates.put(ConnectionStatus.INTERNET, ConnectionStatus.PRECHECK);
+            connectionStates.put(ConnectionStatus.UPDATE_SITE, ConnectionStatus.PRECHECK);
         }
 
         public void run() {
+            connectionStates.put(ConnectionStatus.INTERNET, ConnectionStatus.UNCHECKED);
+            connectionStates.put(ConnectionStatus.UPDATE_SITE, ConnectionStatus.UNCHECKED);
             if (ID_UPLOAD.equals(site.getId())) {
                 return;
             }
             LOGGER.fine("Doing a connectivity check");
+            Future<?> internetCheck = null;
             try {
-                String connectionCheckUrl = site.getConnectionCheckUrl();
+                final String connectionCheckUrl = site.getConnectionCheckUrl();
                 if (connectionCheckUrl!=null) {
+                    connectionStates.put(ConnectionStatus.INTERNET, ConnectionStatus.CHECKING);
                     statuses.add(Messages.UpdateCenter_Status_CheckingInternet());
-                    try {
-                        config.checkConnection(this, connectionCheckUrl);
-                    } catch (IOException e) {
-                        if(e.getMessage().contains("Connection timed out")) {
-                            // Google can't be down, so this is probably a proxy issue
-                            statuses.add(Messages.UpdateCenter_Status_ConnectionFailed(connectionCheckUrl));
-                            return;
+                    // Run the internet check in parallel
+                    internetCheck = updateService.submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                config.checkConnection(ConnectionCheckJob.this, connectionCheckUrl);
+                            } catch (Exception e) {
+                                if(e.getMessage().contains("Connection timed out")) {
+                                    // Google can't be down, so this is probably a proxy issue
+                                    connectionStates.put(ConnectionStatus.INTERNET, ConnectionStatus.FAILED);
+                                    statuses.add(Messages.UpdateCenter_Status_ConnectionFailed(connectionCheckUrl));
+                                    return;
+                                }
+                            }
+                            connectionStates.put(ConnectionStatus.INTERNET, ConnectionStatus.OK);
                         }
-                    }
+                    });
                 }
 
+                connectionStates.put(ConnectionStatus.UPDATE_SITE, ConnectionStatus.CHECKING);
                 statuses.add(Messages.UpdateCenter_Status_CheckingJavaNet());
+
                 config.checkUpdateCenter(this, site.getUrl());
 
+                connectionStates.put(ConnectionStatus.UPDATE_SITE, ConnectionStatus.OK);
                 statuses.add(Messages.UpdateCenter_Status_Success());
             } catch (UnknownHostException e) {
+                connectionStates.put(ConnectionStatus.UPDATE_SITE, ConnectionStatus.FAILED);
                 statuses.add(Messages.UpdateCenter_Status_UnknownHostException(e.getMessage()));
                 addStatus(e);
                 error = e;
-            } catch (IOException e) {
+            } catch (Exception e) {
+                connectionStates.put(ConnectionStatus.UPDATE_SITE, ConnectionStatus.FAILED);
                 statuses.add(Functions.printThrowable(e));
                 error = e;
             }
+            
+            if(internetCheck != null) {
+                try {
+                    // Wait for internet check to complete
+                    internetCheck.get();
+                } catch (Exception e) {
+                    LOGGER.log(Level.WARNING, "Error completing internet connectivity check: " + e.getMessage(), e);
+                }
+            }
         }
 
         private void addStatus(UnknownHostException e) {
@@ -1098,6 +1387,8 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
                 return statuses.toArray(new String[statuses.size()]);
             }
         }
+
+
     }
 
     /**
@@ -1349,7 +1640,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
             File baseDir = pm.rootDir;
             return new File(baseDir, plugin.name + ".jpi");
         }
-        
+
         private File getLegacyDestination() {
             File baseDir = pm.rootDir;
             return new File(baseDir, plugin.name + ".hpi");
@@ -1395,7 +1686,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
         public String toString() {
             return super.toString()+"[plugin="+plugin.title+"]";
         }
-        
+
         /**
          * Called when the download is completed to overwrite
          * the old file with the new file.
@@ -1450,7 +1741,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
             File baseDir = pm.rootDir;
             final File legacy = new File(baseDir, plugin.name + ".hpi");
             if(legacy.exists()){
-            	return legacy;
+                return legacy;
             }
             return new File(baseDir, plugin.name + ".jpi");
         }
@@ -1623,6 +1914,17 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
         h.getUpdateCenter().load();
     }
 
+    @Restricted(NoExternalUse.class)
+    public static void updateDefaultSite() {
+        try {
+            // Need to do the following because the plugin manager will attempt to access
+            // $JENKINS_HOME/updates/default.json. Needs to be up to date.
+            Jenkins.getInstance().getUpdateCenter().getSite(UpdateCenter.ID_DEFAULT).updateDirectlyNow(true);
+        } catch (Exception e) {
+            LOGGER.log(WARNING, "Upgrading Jenkins. Failed to update default UpdateSite. Plugin upgrades may fail.", e);
+        }
+    }
+
     /**
      * Sequence number generator.
      */
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 061091bb67..b6acc6202b 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -25,6 +25,7 @@
 
 package hudson.model;
 
+import hudson.ClassicPluginStrategy;
 import hudson.PluginManager;
 import hudson.PluginWrapper;
 import hudson.Util;
@@ -49,6 +50,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.logging.Level;
@@ -466,7 +468,17 @@ public class UpdateSite {
                 core = null;
             }
             for(Map.Entry<String,JSONObject> e : (Set<Map.Entry<String,JSONObject>>)o.getJSONObject("plugins").entrySet()) {
-                plugins.put(e.getKey(),new Plugin(sourceId, e.getValue()));
+                Plugin p = new Plugin(sourceId, e.getValue());
+                // JENKINS-33308 - include implied dependencies for older plugins that may need them
+                List<PluginWrapper.Dependency> implicitDeps = ClassicPluginStrategy.getImpliedDependencies(p.name, p.requiredCore);
+                if(!implicitDeps.isEmpty()) {
+                    for(PluginWrapper.Dependency dep : implicitDeps) {
+                        if(!p.dependencies.containsKey(dep.shortName)) {
+                            p.dependencies.put(dep.shortName, dep.version);
+                        }
+                    }
+                }
+                plugins.put(e.getKey(), p);
             }
 
             connectionCheckUrl = (String)o.get("connectionCheckUrl");
@@ -611,7 +623,7 @@ public class UpdateSite {
         public final String[] categories;
 
         /**
-         * Dependencies of this plugin.
+         * Dependencies of this plugin, a name -&gt; version mapping.
          */
         @Exported
         public final Map<String,String> dependencies = new HashMap<String,String>();
@@ -633,10 +645,8 @@ public class UpdateSite {
             this.categories = o.has("labels") ? (String[])o.getJSONArray("labels").toArray(new String[0]) : null;
             for(Object jo : o.getJSONArray("dependencies")) {
                 JSONObject depObj = (JSONObject) jo;
-                // Make sure there's a name attribute, that that name isn't maven-plugin - we ignore that one -
-                // and that the optional value isn't true.
-                if (get(depObj,"name")!=null
-                    && !get(depObj,"name").equals("maven-plugin")) {
+                // Make sure there's a name attribute and that the optional value isn't true.
+                if (get(depObj,"name")!=null) {
                     if (get(depObj, "optional").equals("false")) {
                         dependencies.put(get(depObj, "name"), get(depObj, "version"));
                     } else {
@@ -814,6 +824,23 @@ public class UpdateSite {
          *      See {@link UpdateCenter#isRestartRequiredForCompletion()}
          */
         public Future<UpdateCenterJob> deploy(boolean dynamicLoad) {
+            return deploy(dynamicLoad, null);
+        }
+
+        /**
+         * Schedules the installation of this plugin.
+         *
+         * <p>
+         * This is mainly intended to be called from the UI. The actual installation work happens
+         * asynchronously in another thread.
+         *
+         * @param dynamicLoad
+         *      If true, the plugin will be dynamically loaded into this Jenkins. If false,
+         *      the plugin will only take effect after the reboot.
+         *      See {@link UpdateCenter#isRestartRequiredForCompletion()}
+         * @param correlationId A correlation ID to be set on the job.
+         */
+        public Future<UpdateCenterJob> deploy(boolean dynamicLoad, @CheckForNull UUID correlationId) {
             Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
             UpdateCenter uc = Jenkins.getInstance().getUpdateCenter();
             for (Plugin dep : getNeededDependencies()) {
@@ -825,7 +852,9 @@ public class UpdateSite {
                     LOGGER.log(Level.WARNING, "Dependent install of " + dep.name + " for plugin " + name + " already added, skipping");
                 }
             }
-            return uc.addJob(uc.new InstallationJob(this, UpdateSite.this, Jenkins.getAuthentication(), dynamicLoad));
+            UpdateCenter.InstallationJob job = uc.new InstallationJob(this, UpdateSite.this, Jenkins.getAuthentication(), dynamicLoad);
+            job.setCorrelationId(correlationId);
+            return uc.addJob(job);
         }
 
         /**
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index 0cfa562922..f9e2d5c855 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -35,6 +35,7 @@ import hudson.Indenter;
 import hudson.Util;
 import hudson.model.Descriptor.FormException;
 import hudson.model.labels.LabelAtomPropertyDescriptor;
+import hudson.model.listeners.ItemListener;
 import hudson.scm.ChangeLogSet;
 import hudson.scm.ChangeLogSet.Entry;
 import hudson.search.CollectionSearchIndex;
@@ -50,12 +51,16 @@ import hudson.util.AlternativeUiTextProvider.Message;
 import hudson.util.DescribableList;
 import hudson.util.DescriptorList;
 import hudson.util.FormApply;
+import hudson.util.FormValidation;
 import hudson.util.RunList;
 import hudson.util.XStream2;
 import hudson.views.ListViewColumn;
 import hudson.widgets.Widget;
 import jenkins.model.Jenkins;
 import jenkins.model.ModelObjectWithChildren;
+import jenkins.model.item_category.Categories;
+import jenkins.model.item_category.Category;
+import jenkins.model.item_category.ItemCategory;
 import jenkins.util.ProgressiveRendering;
 import jenkins.util.xml.XMLUtils;
 
@@ -63,6 +68,7 @@ import net.sf.json.JSON;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.tools.ant.filters.StringInputStream;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.Stapler;
@@ -84,6 +90,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -105,6 +112,7 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static jenkins.model.Jenkins.*;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.QueryParameter;
 import org.xml.sax.SAXException;
 
 /**
@@ -917,7 +925,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
         SearchIndexBuilder sib = super.makeSearchIndex();
         sib.add(new CollectionSearchIndex<TopLevelItem>() {// for jobs in the view
                 protected TopLevelItem get(String key) { return getItem(key); }
-                protected Collection<TopLevelItem> all() { return getItems(); }                
+                protected Collection<TopLevelItem> all() { return getItems(); }
                 @Override
                 protected String getName(TopLevelItem o) {
                     // return the name instead of the display for suggestion searching
@@ -1000,6 +1008,69 @@ public abstract class View extends AbstractModelObject implements AccessControll
      */
     public abstract Item doCreateItem( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException;
 
+    /**
+     * Makes sure that the given name is good as a job name.
+     * For use from {@code newJob}.
+     */
+    @Restricted(DoNotUse.class) // called from newJob view
+    public FormValidation doCheckJobName(@QueryParameter String value) {
+        // this method can be used to check if a file exists anywhere in the file system,
+        // so it should be protected.
+        getOwner().checkPermission(Item.CREATE);
+
+        if (Util.fixEmpty(value) == null) {
+            return FormValidation.ok();
+        }
+
+        try {
+            Jenkins.checkGoodName(value);
+            value = value.trim(); // why trim *after* checkGoodName? not sure, but ItemGroupMixIn.createTopLevelItem does the same
+            Jenkins.getInstance().getProjectNamingStrategy().checkName(value);
+        } catch (Failure e) {
+            return FormValidation.error(e.getMessage());
+        }
+
+        if (getOwnerItemGroup().getItem(value) != null) {
+            return FormValidation.error(Messages.Hudson_JobAlreadyExists(value));
+        }
+
+        // looks good
+        return FormValidation.ok();
+    }
+
+    /**
+     * An API REST method to get the allowed {$link TopLevelItem}s and its categories.
+     *
+     * @return A {@link Categories} entity that is shown as JSON file.
+     */
+    @Restricted(DoNotUse.class)
+    public Categories doItemCategories(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        Categories categories = new Categories();
+        int order = 0;
+        for (TopLevelItemDescriptor descriptor : DescriptorVisibilityFilter.apply(getOwnerItemGroup(), Items.all(Jenkins.getAuthentication(), getOwnerItemGroup()))) {
+            ItemCategory ic = ItemCategory.getCategory(descriptor);
+            Map<String, Serializable> metadata = new HashMap<String, Serializable>();
+
+            // Information about Item.
+            metadata.put("class", descriptor.getId());
+            metadata.put("order", ++order);
+            metadata.put("displayName", descriptor.getDisplayName());
+            metadata.put("description", descriptor.getDescription());
+            metadata.put("iconFilePathPattern", descriptor.getIconFilePathPattern());
+
+            Category category = categories.getItem(ic.getId());
+            if (category != null) {
+                category.getItems().add(metadata);
+            } else {
+                List<Map<String, Serializable>> temp = new ArrayList<Map<String, Serializable>>();
+                temp.add(metadata);
+                category = new Category(ic.getId(), ic.getDisplayName(), ic.getDescription(), ic.getOrder(), ic.getMinToShow(), temp);
+                categories.getItems().add(category);
+            }
+        }
+        return categories;
+    }
+
     public void doRssAll( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
         rss(req, rsp, " all builds", getBuilds());
     }
diff --git a/core/src/main/java/hudson/model/ViewDescriptor.java b/core/src/main/java/hudson/model/ViewDescriptor.java
index 2f304fa90f..f40ee0f59f 100644
--- a/core/src/main/java/hudson/model/ViewDescriptor.java
+++ b/core/src/main/java/hudson/model/ViewDescriptor.java
@@ -26,12 +26,14 @@ package hudson.model;
 import hudson.views.ListViewColumn;
 import hudson.views.ListViewColumnDescriptor;
 import hudson.views.ViewJobFilter;
+import java.util.Iterator;
+import java.util.List;
+import jenkins.model.DirectlyModifiableTopLevelItemGroup;
+import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
-import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.AncestorInPath;
-
-import java.util.List;
+import org.kohsuke.stapler.QueryParameter;
 
 /**
  * {@link Descriptor} for {@link View}.
@@ -76,8 +78,22 @@ public abstract class ViewDescriptor extends Descriptor<View> {
      * Auto-completion for the "copy from" field in the new job page.
      */
     @Restricted(DoNotUse.class)
-    public AutoCompletionCandidates doAutoCompleteCopyNewItemFrom(@QueryParameter final String value, @AncestorInPath ItemGroup container) {
-        return AutoCompletionCandidates.ofJobNames(TopLevelItem.class, value, container);
+    public AutoCompletionCandidates doAutoCompleteCopyNewItemFrom(@QueryParameter final String value, @AncestorInPath ItemGroup<?> container) {
+        AutoCompletionCandidates candidates = AutoCompletionCandidates.ofJobNames(TopLevelItem.class, value, container);
+        if (container instanceof DirectlyModifiableTopLevelItemGroup) {
+            DirectlyModifiableTopLevelItemGroup modifiableContainer = (DirectlyModifiableTopLevelItemGroup) container;
+            Iterator<String> it = candidates.getValues().iterator();
+            while (it.hasNext()) {
+                TopLevelItem item = Jenkins.getInstance().getItem(it.next(), container, TopLevelItem.class);
+                if (item == null) {
+                    continue; // ?
+                }
+                if (!modifiableContainer.canAdd(item)) {
+                    it.remove();
+                }
+            }
+        }
+        return candidates;
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/WorkspaceBrowser.java b/core/src/main/java/hudson/model/WorkspaceBrowser.java
index 35d6280ded..037420d53d 100644
--- a/core/src/main/java/hudson/model/WorkspaceBrowser.java
+++ b/core/src/main/java/hudson/model/WorkspaceBrowser.java
@@ -33,8 +33,8 @@ import javax.annotation.CheckForNull;
 /**
  * Allows to access a workspace as an alternative to online build node.
  * <p>
- * Primary use case is {@link hudson.slaves.Cloud} implementations that don't keep the slave
- * node online to browse workspace, but maintain a copy of node workspace on master.
+ * Primary use case is {@link hudson.slaves.Cloud} implementations that don't keep the agent
+ * online to browse workspace, but maintain a copy of node workspace on master.
  *
  * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
  * @since 1.502
diff --git a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java
index a7a606b476..60a53f3e25 100644
--- a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java
+++ b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java
@@ -39,7 +39,7 @@ import jenkins.model.Jenkins;
 import jenkins.model.ModifiableTopLevelItemGroup;
 
 /**
- * Clean up old left-over workspaces from slaves.
+ * Clean up old left-over workspaces from agents.
  *
  * @author Kohsuke Kawaguchi
  */
diff --git a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java
index 054c6e08d7..a825594798 100644
--- a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java
+++ b/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java
@@ -20,7 +20,7 @@ import static java.util.logging.Level.WARNING;
 
 /**
  * Sophisticated version of {@link AbstractNodeMonitorDescriptor} that
- * performs monitoring on all slaves concurrently and asynchronously.
+ * performs monitoring on all agents concurrently and asynchronously.
  *
  * @param <T>
  *     represents the the result of the monitoring.
diff --git a/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java b/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java
index ec0618f807..650c24cc04 100644
--- a/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java
+++ b/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java
@@ -33,7 +33,7 @@ import org.kohsuke.stapler.StaplerRequest;
 import java.io.IOException;
 
 /**
- * Discovers the architecture of the system to display in the slave list page.
+ * Discovers the architecture of the system to display in the agent list page.
  *
  * @author Kohsuke Kawaguchi
  */
diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitor.java b/core/src/main/java/hudson/node_monitors/NodeMonitor.java
index 9429af2c1b..17ddf7343e 100644
--- a/core/src/main/java/hudson/node_monitors/NodeMonitor.java
+++ b/core/src/main/java/hudson/node_monitors/NodeMonitor.java
@@ -114,11 +114,11 @@ public abstract class NodeMonitor implements ExtensionPoint, Describable<NodeMon
     }
 
     /**
-     * True if this monitoring shouldn't mark the slaves offline.
+     * True if this monitoring shouldn't mark the agents offline.
      *
      * <p>
      * Many {@link NodeMonitor}s implement a logic that if the value goes above/below
-     * a threshold, the slave will be marked offline as a preventive measure.
+     * a threshold, the agent will be marked offline as a preventive measure.
      * This flag controls that.
      *
      * <p>
diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java b/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java
index 9f3b5f19ff..c23b069f8f 100644
--- a/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java
+++ b/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;
 import jenkins.util.Timer;
 
 /**
- * When a slave is connected, redo the node monitoring.
+ * When an agent is connected, redo the node monitoring.
  *
  * @author Kohsuke Kawaguchi
  */
@@ -34,7 +34,7 @@ public class NodeMonitorUpdater extends ComputerListener {
 
     /**
      * Triggers the update with 5 seconds quiet period, to avoid triggering data check too often
-     * when multiple slaves become online at about the same time.
+     * when multiple agents become online at about the same time.
      */
     @Override
     public void onOnline(Computer c, TaskListener listener) throws IOException, InterruptedException {
diff --git a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
index af1c3a79e4..652b2217fb 100644
--- a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
+++ b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
@@ -40,7 +40,7 @@ import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
 /**
- * Monitors the round-trip response time to this slave.
+ * Monitors the round-trip response time to this agent.
  *
  * @author Kohsuke Kawaguchi
  */
@@ -64,9 +64,9 @@ public class ResponseTimeMonitor extends NodeMonitor {
                 }
 
                 if(d.hasTooManyTimeouts() && !isIgnored()) {
-                    // unlike other monitors whose failure still allow us to communicate with the slave,
+                    // unlike other monitors whose failure still allow us to communicate with the agent,
                     // the failure in this monitor indicates that we are just unable to make any requests
-                    // to this slave. So we should severe the connection, as opposed to marking it temporarily
+                    // to this agent. So we should severe the connection, as opposed to marking it temporarily
                     // off line, which still keeps the underlying channel open.
                     c.disconnect(d);
                     LOGGER.warning(Messages.ResponseTimeMonitor_MarkedOffline(c.getName()));
diff --git a/core/src/main/java/hudson/node_monitors/package.html b/core/src/main/java/hudson/node_monitors/package.html
index e7c11a0742..e178fe411c 100644
--- a/core/src/main/java/hudson/node_monitors/package.html
+++ b/core/src/main/java/hudson/node_monitors/package.html
@@ -23,5 +23,5 @@ THE SOFTWARE.
 -->
 
 <html><head/><body>
-Code that monitors the health of slaves
+Code that monitors the health of agents
 </body></html>
\ No newline at end of file
diff --git a/core/src/main/java/hudson/os/solaris/ZFSProvisioner.java b/core/src/main/java/hudson/os/solaris/ZFSProvisioner.java
index a2ba279f3b..bff594b227 100644
--- a/core/src/main/java/hudson/os/solaris/ZFSProvisioner.java
+++ b/core/src/main/java/hudson/os/solaris/ZFSProvisioner.java
@@ -59,7 +59,7 @@ public class ZFSProvisioner extends FileSystemProvisioner implements Serializabl
                 ZFSFileSystem fs = libzfs.getFileSystemByMountPoint(f);
                 if(fs!=null)    return fs.getName();
 
-                // TODO: for now, only support slaves that are already on ZFS.
+                // TODO: for now, only support agents that are already on ZFS.
                 throw new IOException("Not on ZFS");
             }
         });
diff --git a/core/src/main/java/hudson/scm/SCM.java b/core/src/main/java/hudson/scm/SCM.java
index e7597933d0..ce9d7a6762 100644
--- a/core/src/main/java/hudson/scm/SCM.java
+++ b/core/src/main/java/hudson/scm/SCM.java
@@ -152,7 +152,7 @@ public abstract class SCM implements Describable<SCM>, ExtensionPoint {
      *
      * <p>
      * This flag affects the behavior of Hudson when a job lost its workspace
-     * (typically due to a slave outage.) If this method returns false and
+     * (typically due to a agent outage.) If this method returns false and
      * polling is configured, then that would immediately trigger a new build.
      *
      * <p>
@@ -177,9 +177,9 @@ public abstract class SCM implements Describable<SCM>, ExtensionPoint {
      * Called before a workspace is deleted on the given node, to provide SCM an opportunity to perform clean up.
      *
      * <p>
-     * Hudson periodically scans through all the slaves and removes old workspaces that are deemed unnecessary.
+     * Hudson periodically scans through all the agents and removes old workspaces that are deemed unnecessary.
      * This behavior is implemented in {@link WorkspaceCleanupThread}, and it is necessary to control the
-     * disk consumption on slaves. If we don't do this, in a long run, all the slaves will have workspaces
+     * disk consumption on agents. If we don't do this, in a long run, all the agents will have workspaces
      * for all the projects, which will be prohibitive in big Hudson.
      *
      * <p>
@@ -191,7 +191,7 @@ public abstract class SCM implements Describable<SCM>, ExtensionPoint {
      * recursive directory deletion happens.
      *
      * <p>
-     * Note that this method does not guarantee that such a clean up will happen. For example, slaves can be
+     * Note that this method does not guarantee that such a clean up will happen. For example, agents can be
      * taken offline by being physically removed from the network, and in such a case there's no opportunity
      * to perform this clean up.
      *
@@ -233,7 +233,7 @@ public abstract class SCM implements Describable<SCM>, ExtensionPoint {
      * Checks if there has been any changes to this module in the repository.
      *
      * TODO: we need to figure out a better way to communicate an error back,
-     * so that we won't keep retrying the same node (for example a slave might be down.)
+     * so that we won't keep retrying the same node (for example an agent might be down.)
      *
      * <p>
      * If the SCM doesn't implement polling, have the {@link #supportsPolling()} method
diff --git a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java
index 8b2239f2f4..bdebc0fca4 100644
--- a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java
@@ -29,6 +29,7 @@ import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
 
 import javax.inject.Inject;
 import java.util.Collections;
@@ -36,30 +37,52 @@ import java.util.List;
 
 /**
  * {@link AuthorizationStrategy} that grants full-control to authenticated user
- * (other than anonymous users.)
+ * and optionally read access to anonymous users
  *
  * @author Kohsuke Kawaguchi
  */
 public class FullControlOnceLoggedInAuthorizationStrategy extends AuthorizationStrategy {
+    /**
+     * Whether to allow anonymous read access, for backward compatibility
+     * default is to allow it
+     */
+    private boolean denyAnonymousReadAccess = false;
+    
     @DataBoundConstructor
     public FullControlOnceLoggedInAuthorizationStrategy() {
     }
 
     @Override
     public ACL getRootACL() {
-        return THE_ACL;
+        return denyAnonymousReadAccess ? AUTHENTICATED_READ : ANONYMOUS_READ;
     }
 
     public List<String> getGroups() {
         return Collections.emptyList();
     }
+    
+    /**
+     * If true, anonymous read access will be allowed
+     */
+    public boolean isAllowAnonymousRead() {
+        return !denyAnonymousReadAccess;
+    }
+    
+    @DataBoundSetter
+    public void setAllowAnonymousRead(boolean allowAnonymousRead) {
+        this.denyAnonymousReadAccess = !allowAnonymousRead;
+    }
 
-    private static final SparseACL THE_ACL = new SparseACL(null);
+    private static final SparseACL AUTHENTICATED_READ = new SparseACL(null);
+    private static final SparseACL ANONYMOUS_READ = new SparseACL(null);
 
     static {
-        THE_ACL.add(ACL.EVERYONE, Jenkins.ADMINISTER,true);
-        THE_ACL.add(ACL.ANONYMOUS, Jenkins.ADMINISTER,false);
-        THE_ACL.add(ACL.ANONYMOUS,Permission.READ,true);
+        ANONYMOUS_READ.add(ACL.EVERYONE, Jenkins.ADMINISTER,true);
+        ANONYMOUS_READ.add(ACL.ANONYMOUS, Jenkins.ADMINISTER,false);
+        ANONYMOUS_READ.add(ACL.ANONYMOUS, Permission.READ,true);
+        
+        AUTHENTICATED_READ.add(ACL.EVERYONE, Jenkins.ADMINISTER, true);
+        AUTHENTICATED_READ.add(ACL.ANONYMOUS, Jenkins.ADMINISTER, false);
     }
 
     /**
diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index ffaf8311d7..3abe60ee19 100644
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -1,18 +1,18 @@
 /*
  * The MIT License
- * 
+ *
  * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, David Calavera, Seiji Sogabe
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -79,7 +79,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -97,7 +96,7 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
     /**
      * If true, sign up is not allowed.
      * <p>
-     * This is a negative switch so that the default value 'false' remains compatible with older installations. 
+     * This is a negative switch so that the default value 'false' remains compatible with older installations.
      */
     private final boolean disableSignup;
 
@@ -260,16 +259,26 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
     }
 
     /**
-     * Creates an user account. Used by admins.
+     * Creates a user account. Used by admins.
      *
      * This version behaves differently from {@link #doCreateAccount(StaplerRequest, StaplerResponse)} in that
      * this is someone creating another user.
      */
     public void doCreateAccountByAdmin(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        createAccountByAdmin(req, rsp, "addUser.jelly", "."); // send the user back to the listing page on success
+    }
+
+    /**
+     * Creates a user account. Requires {@link Jenkins#ADMINISTER}
+     */
+    @Restricted(NoExternalUse.class)
+    public User createAccountByAdmin(StaplerRequest req, StaplerResponse rsp, String addUserView, String successView) throws IOException, ServletException {
         checkPermission(Jenkins.ADMINISTER);
-        if(createAccount(req, rsp, false, "addUser.jelly")!=null) {
-            rsp.sendRedirect(".");  // send the user back to the listing page
+        User u = createAccount(req, rsp, false, addUserView);
+        if(u != null) {
+            rsp.sendRedirect(successView);
         }
+        return u;
     }
 
     /**
@@ -334,7 +343,7 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
         if(si.fullname==null || si.fullname.length()==0)
             si.fullname = si.username;
 
-        if(si.email==null || !si.email.contains("@"))
+        if(isMailerPluginPresent() && (si.email==null || !si.email.contains("@")))
             si.errorMessage = Messages.HudsonPrivateSecurityRealm_CreateAccount_InvalidEmailAddress();
 
         if (! User.isIdOrFullnameAllowed(si.username)) {
@@ -355,19 +364,30 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
         // register the user
         User user = createAccount(si.username,si.password1);
         user.setFullName(si.fullname);
-        try {
-            // legacy hack. mail support has moved out to a separate plugin
-            Class<?> up = Jenkins.getInstance().pluginManager.uberClassLoader.loadClass("hudson.tasks.Mailer$UserProperty");
-            Constructor<?> c = up.getDeclaredConstructor(String.class);
-            user.addProperty((UserProperty)c.newInstance(si.email));
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            LOGGER.log(Level.WARNING, "Failed to set the e-mail address",e);
+        if(isMailerPluginPresent()) {
+            try {
+                // legacy hack. mail support has moved out to a separate plugin
+                Class<?> up = Jenkins.getInstance().pluginManager.uberClassLoader.loadClass("hudson.tasks.Mailer$UserProperty");
+                Constructor<?> c = up.getDeclaredConstructor(String.class);
+                user.addProperty((UserProperty)c.newInstance(si.email));
+            } catch (ReflectiveOperationException e) {
+                throw new RuntimeException(e);
+            }
         }
         user.save();
         return user;
     }
+    
+    @Restricted(NoExternalUse.class)
+    public boolean isMailerPluginPresent() {
+        try {
+            // mail support has moved to a separate plugin
+            return null != Jenkins.getInstance().pluginManager.uberClassLoader.loadClass("hudson.tasks.Mailer$UserProperty");
+        } catch (ClassNotFoundException e) {
+            LOGGER.finer("Mailer plugin not present");
+        }
+        return false;
+    }
 
     /**
      * Creates a new user account by registering a password to the user.
diff --git a/core/src/main/java/hudson/security/csrf/CrumbFilter.java b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
index 9080a54692..557e96f766 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbFilter.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
@@ -62,17 +62,11 @@ public class CrumbFilter implements Filter {
             String crumbFieldName = crumbIssuer.getDescriptor().getCrumbRequestField();
             String crumbSalt = crumbIssuer.getDescriptor().getCrumbSalt();
 
-            String crumb = httpRequest.getHeader(crumbFieldName);
             boolean valid = false;
+            String crumb = extractCrumbFromRequest(httpRequest, crumbFieldName);
             if (crumb == null) {
-                Enumeration<?> paramNames = request.getParameterNames();
-                while (paramNames.hasMoreElements()) {
-                    String paramName = (String) paramNames.nextElement();
-                    if (crumbFieldName.equals(paramName)) {
-                        crumb = request.getParameter(paramName);
-                        break;
-                    }
-                }
+                // compatibility for clients that hard-code the default crumb name up to Jenkins 1.TODO
+                extractCrumbFromRequest(httpRequest, ".crumb");
             }
             if (crumb != null) {
                 if (crumbIssuer.validateCrumb(httpRequest, crumbSalt, crumb)) {
@@ -93,6 +87,21 @@ public class CrumbFilter implements Filter {
         }
     }
 
+    private String extractCrumbFromRequest(HttpServletRequest httpRequest, String crumbFieldName) {
+        String crumb = httpRequest.getHeader(crumbFieldName);
+        if (crumb == null) {
+            Enumeration<?> paramNames = httpRequest.getParameterNames();
+            while (paramNames.hasMoreElements()) {
+                String paramName = (String) paramNames.nextElement();
+                if (crumbFieldName.equals(paramName)) {
+                    crumb = httpRequest.getParameter(paramName);
+                    break;
+                }
+            }
+        }
+        return crumb;
+    }
+
     protected static boolean isMultipart(HttpServletRequest request) {
         if (request == null) {
             return false;
diff --git a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
index 6daacd364d..3d80b1a5b6 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
@@ -44,6 +44,9 @@ public abstract class CrumbIssuer implements Describable<CrumbIssuer>, Extension
 
     private static final String CRUMB_ATTRIBUTE = CrumbIssuer.class.getName() + "_crumb";
 
+    @Restricted(NoExternalUse.class)
+    public static final String DEFAULT_CRUMB_NAME = "Jenkins-Crumb";
+
     /**
      * Get the name of the request parameter the crumb will be stored in. Exposed
      * here for the remote API.
@@ -199,7 +202,7 @@ public abstract class CrumbIssuer implements Describable<CrumbIssuer>, Extension
             } else if ("concat(//crumbRequestField,\":\",//crumb)".equals(xpath)) { // new FullDuplexHttpStream; Main
                 text = ci.getCrumbRequestField() + ':' + ci.getCrumb();
             } else if ("concat(//crumbRequestField,'=',//crumb)".equals(xpath)) { // NetBeans
-                if (ci.getCrumbRequestField().startsWith(".")) {
+                if (ci.getCrumbRequestField().startsWith(".") || ci.getCrumbRequestField().contains("-")) {
                     text = ci.getCrumbRequestField() + '=' + ci.getCrumb();
                 } else {
                     text = null;
diff --git a/core/src/main/java/hudson/security/csrf/CrumbIssuerDescriptor.java b/core/src/main/java/hudson/security/csrf/CrumbIssuerDescriptor.java
index 013405b66a..84d9fb5c16 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbIssuerDescriptor.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbIssuerDescriptor.java
@@ -64,7 +64,7 @@ public abstract class CrumbIssuerDescriptor<T extends CrumbIssuer> extends Descr
      */
     public void setCrumbRequestField(String requestField) {
         if (Util.fixEmptyAndTrim(requestField) == null) {
-            crumbRequestField = ".crumb";
+            crumbRequestField = CrumbIssuer.DEFAULT_CRUMB_NAME;
         } else {
             crumbRequestField = requestField;
         }
diff --git a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
index 35447865e8..92d0231e1f 100644
--- a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
+++ b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
@@ -124,7 +124,7 @@ public class DefaultCrumbIssuer extends CrumbIssuer {
         private final static HexStringConfidentialKey CRUMB_SALT = new HexStringConfidentialKey(Jenkins.class,"crumbSalt",16);
         
         public DescriptorImpl() {
-            super(CRUMB_SALT.get(), System.getProperty("hudson.security.csrf.requestfield", ".crumb"));
+            super(CRUMB_SALT.get(), System.getProperty("hudson.security.csrf.requestfield", CrumbIssuer.DEFAULT_CRUMB_NAME));
             load();
         }
 
diff --git a/core/src/main/java/hudson/slaves/AbstractCloudComputer.java b/core/src/main/java/hudson/slaves/AbstractCloudComputer.java
index 32acc2030a..ee6b32c0ff 100644
--- a/core/src/main/java/hudson/slaves/AbstractCloudComputer.java
+++ b/core/src/main/java/hudson/slaves/AbstractCloudComputer.java
@@ -50,7 +50,7 @@ public class AbstractCloudComputer<T extends AbstractCloudSlave> extends SlaveCo
     }
 
     /**
-     * When the slave is deleted, free the node right away.
+     * When the agent is deleted, free the node right away.
      */
     @Override
     public HttpResponse doDoDelete() throws IOException {
diff --git a/core/src/main/java/hudson/slaves/AbstractCloudSlave.java b/core/src/main/java/hudson/slaves/AbstractCloudSlave.java
index cc7967d8ef..93f0f93b0c 100644
--- a/core/src/main/java/hudson/slaves/AbstractCloudSlave.java
+++ b/core/src/main/java/hudson/slaves/AbstractCloudSlave.java
@@ -55,7 +55,7 @@ public abstract class AbstractCloudSlave extends Slave {
     public abstract AbstractCloudComputer createComputer();
 
     /**
-     * Releases and removes this slave.
+     * Releases and removes this agent.
      */
     public void terminate() throws InterruptedException, IOException {
         final Computer computer = toComputer();
diff --git a/core/src/main/java/hudson/slaves/ChannelPinger.java b/core/src/main/java/hudson/slaves/ChannelPinger.java
index 49ae7c1cf9..b6216f2cf6 100644
--- a/core/src/main/java/hudson/slaves/ChannelPinger.java
+++ b/core/src/main/java/hudson/slaves/ChannelPinger.java
@@ -74,7 +74,7 @@ public class ChannelPinger extends ComputerListener {
 
     public void install(Channel channel) {
         if (pingInterval < 1) {
-            LOGGER.fine("Slave ping is disabled");
+            LOGGER.fine("Agent ping is disabled");
             return;
         }
 
diff --git a/core/src/main/java/hudson/slaves/Cloud.java b/core/src/main/java/hudson/slaves/Cloud.java
index c3e3679474..651ba81f5a 100644
--- a/core/src/main/java/hudson/slaves/Cloud.java
+++ b/core/src/main/java/hudson/slaves/Cloud.java
@@ -44,23 +44,23 @@ import org.kohsuke.stapler.DataBoundConstructor;
 import java.util.Collection;
 
 /**
- * Creates {@link Node}s to dynamically expand/shrink the slaves attached to Hudson.
+ * Creates {@link Node}s to dynamically expand/shrink the agents attached to Hudson.
  *
  * <p>
  * Put another way, this class encapsulates different communication protocols
- * needed to start a new slave programmatically.
+ * needed to start a new agent programmatically.
  *
  * <h2>Notes for implementers</h2>
- * <h4>Automatically delete idle slaves</h4>
+ * <h4>Automatically delete idle agents</h4>
  * <p>
  * Nodes provisioned from a cloud do not automatically get released just because it's created from {@link Cloud}.
  * Doing so requires a use of {@link RetentionStrategy}. Instantiate your {@link Slave} subtype with something
  * like {@link CloudSlaveRetentionStrategy} so that it gets automatically deleted after some idle time.
  *
- * <h4>Freeing an external resource when a slave is removed</h4>
+ * <h4>Freeing an external resource when an agent is removed</h4>
  * <p>
  * Whether you do auto scale-down or not, you often want to release an external resource tied to a cloud-allocated
- * slave when it is removed.
+ * agent when it is removed.
  *
  * <p>
  * To do this, have your {@link Slave} subtype remember the necessary handle (such as EC2 instance ID)
@@ -137,7 +137,7 @@ public abstract class Cloud extends AbstractModelObject implements ExtensionPoin
      * @param excessWorkload
      *      Number of total executors needed to meet the current demand.
      *      Always >= 1. For example, if this is 3, the implementation
-     *      should launch 3 slaves with 1 executor each, or 1 slave with
+     *      should launch 3 agents with 1 executor each, or 1 agent with
      *      3 executors, etc.
      * @return
      *      {@link PlannedNode}s that represent asynchronous {@link Node}
diff --git a/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java b/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java
index ac9a404d47..1948d6b10d 100644
--- a/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java
+++ b/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java
@@ -11,9 +11,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * Default convenience implementation of {@link RetentionStrategy} for slaves provisioned from {@link Cloud}.
+ * Default convenience implementation of {@link RetentionStrategy} for agents provisioned from {@link Cloud}.
  *
- * If a slave is idle for 10 mins, this retention strategy will remove the slave. This can be used as-is for
+ * If an agent is idle for 10 mins, this retention strategy will remove the agent. This can be used as-is for
  * a {@link Node} provisioned by cloud to implement the auto-scaling semantics, it can be subtyped to tweak
  * the behavior, or it can be used as an example.
  * <p>TODO {@link CloudRetentionStrategy} seems to be a better implementation.
@@ -64,7 +64,7 @@ public class CloudSlaveRetentionStrategy<T extends Computer> extends RetentionSt
     }
 
     /**
-     * If the computer has been idle longer than this time, we'll kill the slave.
+     * If the computer has been idle longer than this time, we'll kill the agent.
      */
     protected long getIdleMaxTime() {
         return TIMEOUT;
diff --git a/core/src/main/java/hudson/slaves/CommandLauncher.java b/core/src/main/java/hudson/slaves/CommandLauncher.java
index 66cfaaf056..fdaaa06441 100644
--- a/core/src/main/java/hudson/slaves/CommandLauncher.java
+++ b/core/src/main/java/hudson/slaves/CommandLauncher.java
@@ -140,7 +140,7 @@ public class CommandLauncher extends ComputerLauncher {
                 }
             });
 
-            LOGGER.info("slave agent launched for " + computer.getDisplayName());
+            LOGGER.info("agent launched for " + computer.getDisplayName());
         } catch (InterruptedException e) {
             e.printStackTrace(listener.error(Messages.ComputerLauncher_abortedLaunch()));
         } catch (RuntimeException e) {
diff --git a/core/src/main/java/hudson/slaves/ComputerLauncher.java b/core/src/main/java/hudson/slaves/ComputerLauncher.java
index 18c44d7b60..cbca34f3ff 100644
--- a/core/src/main/java/hudson/slaves/ComputerLauncher.java
+++ b/core/src/main/java/hudson/slaves/ComputerLauncher.java
@@ -37,7 +37,7 @@ import org.apache.tools.ant.util.DeweyDecimal;
 
 /**
  * Extension point to allow control over how {@link Computer}s are "launched",
- * meaning how they get connected to their slave agent program.
+ * meaning how they get connected to their agent program.
  *
  * <h2>Associated View</h2>
  * <dl>
@@ -54,17 +54,17 @@ import org.apache.tools.ant.util.DeweyDecimal;
 public abstract class ComputerLauncher extends AbstractDescribableImpl<ComputerLauncher> implements ExtensionPoint {
     /**
      * Returns true if this {@link ComputerLauncher} supports
-     * programatic launch of the slave agent in the target {@link Computer}.
+     * programatic launch of the agent in the target {@link Computer}.
      */
     public boolean isLaunchSupported() {
         return true;
     }
 
     /**
-     * Launches the slave agent for the given {@link Computer}.
+     * Launches the agent for the given {@link Computer}.
      *
      * <p>
-     * If the slave agent is launched successfully, {@link SlaveComputer#setChannel(InputStream, OutputStream, TaskListener, Channel.Listener)}
+     * If the agent is launched successfully, {@link SlaveComputer#setChannel(InputStream, OutputStream, TaskListener, Channel.Listener)}
      * should be invoked in the end to notify Hudson of the established connection.
      * The operation could also fail, in which case there's no need to make any callback notification,
      * (except to notify the user of the failure through {@link StreamTaskListener}.)
diff --git a/core/src/main/java/hudson/slaves/ComputerListener.java b/core/src/main/java/hudson/slaves/ComputerListener.java
index 01c0cfab6e..c2e4dc1f70 100644
--- a/core/src/main/java/hudson/slaves/ComputerListener.java
+++ b/core/src/main/java/hudson/slaves/ComputerListener.java
@@ -51,7 +51,7 @@ public abstract class ComputerListener implements ExtensionPoint {
      *
      * <p>
      * This enables you to do some configurable checks to see if we
-     * want to bring this slave online or if there are considerations
+     * want to bring this agent online or if there are considerations
      * that would keep us from doing so.
      *
      * <p>
@@ -61,7 +61,7 @@ public abstract class ComputerListener implements ExtensionPoint {
      * @param c
      *      Computer that's being launched. Never null.
      * @param taskListener
-     *      Connected to the slave console log. Useful for reporting progress/errors on a lengthy operation.
+     *      Connected to the agent console log. Useful for reporting progress/errors on a lengthy operation.
      *      Never null.
      * @throws AbortException
      *      Exceptions will be recorded to the listener, and
@@ -73,12 +73,12 @@ public abstract class ComputerListener implements ExtensionPoint {
     }
 
     /**
-     * Called when a slave attempted to connect via {@link ComputerLauncher} but it failed.
+     * Called when an agent attempted to connect via {@link ComputerLauncher} but it failed.
      *
      * @param c
      *      Computer that was trying to launch. Never null.
      * @param taskListener
-     *      Connected to the slave console log. Useful for reporting progress/errors on a lengthy operation.
+     *      Connected to the agent console log. Useful for reporting progress/errors on a lengthy operation.
      *      Never null.
      *
      * @since 1.402
@@ -90,19 +90,19 @@ public abstract class ComputerListener implements ExtensionPoint {
      * Called before a {@link Computer} is marked online.
      *
      * <p>
-     * This enables you to do some work on all the slaves
+     * This enables you to do some work on all the agents
      * as they get connected. Unlike {@link #onOnline(Computer, TaskListener)},
      * a failure to carry out this function normally will prevent
      * a computer from marked as online.
      *
      * @param channel
-     *      This is the channel object to talk to the slave.
+     *      This is the channel object to talk to the agent.
      *      (This is the same object returned by {@link Computer#getChannel()} once
      *      it's connected.
      * @param root
-     *      The directory where this slave stores files.
+     *      The directory where this agent stores files.
      *      The same as {@link Node#getRootPath()}, except that method returns
-     *      null until the slave is connected. So this parameter is passed explicitly instead.
+     *      null until the agent is connected. So this parameter is passed explicitly instead.
      * @param listener
      *      This is connected to the launch log of the computer.
      *      Since this method is called synchronously from the thread
@@ -136,11 +136,11 @@ public abstract class ComputerListener implements ExtensionPoint {
      * Called right after a {@link Computer} comes online.
      *
      * <p>
-     * This enables you to do some work on all the slaves
+     * This enables you to do some work on all the agents
      * as they get connected.
      *
      * <p>
-     * Starting Hudson 1.312, this method is also invoked for the master, not just for slaves.
+     * Starting Hudson 1.312, this method is also invoked for the master, not just for agents.
      *
      * @param listener
      *      This is connected to the launch log of the computer.
@@ -199,7 +199,7 @@ public abstract class ComputerListener implements ExtensionPoint {
      * Called when configuration of the node was changed, a node is added/removed, etc.
      *
      * <p>
-     * This callback is to signal when there's any change to the list of slaves registered to the system,
+     * This callback is to signal when there's any change to the list of agents registered to the system,
      * including addition, removal, changing of the setting, and so on.
      *
      * @since 1.377
diff --git a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java
index 7dbfb0de96..6a9bff31c1 100644
--- a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java
+++ b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java
@@ -34,7 +34,7 @@ import hudson.model.PeriodicWork;
 import hudson.Extension;
 
 /**
- * Periodically checks the slaves and try to reconnect dead slaves.
+ * Periodically checks the agents and try to reconnect dead agents.
  *
  * @author Kohsuke Kawaguchi
  * @author Stephen Connolly
diff --git a/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java b/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java
index 41d9aaa431..c9c9071f7b 100644
--- a/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java
+++ b/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java
@@ -37,7 +37,7 @@ import java.io.IOException;
 import java.util.logging.Logger;
 
 /**
- * Makes sure that connections to slaves are alive, and if they are not, cut them off.
+ * Makes sure that connections to agents are alive, and if they are not, cut them off.
  *
  * <p>
  * If we only rely on TCP retransmission time out for this, the time it takes to detect a bad connection
@@ -49,7 +49,7 @@ import java.util.logging.Logger;
 @Extension
 public class ConnectionActivityMonitor extends AsyncPeriodicWork {
     public ConnectionActivityMonitor() {
-        super("Connection Activity monitoring to slaves");
+        super("Connection Activity monitoring to agents");
     }
 
     protected void execute(TaskListener listener) throws IOException, InterruptedException {
@@ -61,7 +61,7 @@ public class ConnectionActivityMonitor extends AsyncPeriodicWork {
             if (ch instanceof Channel) {
                 Channel channel = (Channel) ch;
                 if (now-channel.getLastHeard() > TIME_TILL_PING) {
-                    // haven't heard from this slave for a while.
+                    // haven't heard from this agent for a while.
                     Long lastPing = (Long)channel.getProperty(ConnectionActivityMonitor.class);
 
                     if (lastPing!=null && now-lastPing > TIMEOUT) {
diff --git a/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java b/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java
index ca6e954feb..e73d44b084 100644
--- a/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java
+++ b/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java
@@ -47,7 +47,7 @@ import java.util.List;
 public class EnvironmentVariablesNodeProperty extends NodeProperty<Node> {
 
     /**
-     * Slave-specific environment variables
+     * Agent-specific environment variables
      */
     private final EnvVars envVars;
     
diff --git a/core/src/main/java/hudson/slaves/JNLPLauncher.java b/core/src/main/java/hudson/slaves/JNLPLauncher.java
index b89178a13e..4a43adbbaf 100644
--- a/core/src/main/java/hudson/slaves/JNLPLauncher.java
+++ b/core/src/main/java/hudson/slaves/JNLPLauncher.java
@@ -37,7 +37,7 @@ import org.kohsuke.stapler.DataBoundConstructor;
 */
 public class JNLPLauncher extends ComputerLauncher {
     /**
-     * If the slave needs to tunnel the connection to the master,
+     * If the agent needs to tunnel the connection to the master,
      * specify the "host:port" here. This can include the special
      * syntax "host:" and ":port" to indicate the default host/port
      * shall be used.
diff --git a/core/src/main/java/hudson/slaves/NodeProperty.java b/core/src/main/java/hudson/slaves/NodeProperty.java
index b87a57fe88..4a8240d268 100644
--- a/core/src/main/java/hudson/slaves/NodeProperty.java
+++ b/core/src/main/java/hudson/slaves/NodeProperty.java
@@ -160,7 +160,7 @@ public abstract class NodeProperty<N extends Node> implements ReconfigurableDesc
      * @param env
      *      Manipulate this variable (normally by adding more entries.)
      *      Note that this is an override, so it doesn't contain environment variables that are
-     *      currently set for the slave process itself.
+     *      currently set for the agent process itself.
      * @param listener
      *      Can be used to send messages.
      *
diff --git a/core/src/main/java/hudson/slaves/NodeProvisioner.java b/core/src/main/java/hudson/slaves/NodeProvisioner.java
index 3f5ea3642b..699d9b8cb1 100644
--- a/core/src/main/java/hudson/slaves/NodeProvisioner.java
+++ b/core/src/main/java/hudson/slaves/NodeProvisioner.java
@@ -228,13 +228,13 @@ public class NodeProvisioner {
                             } catch (InterruptedException e) {
                                 throw new AssertionError(e); // since we confirmed that the future is already done
                             } catch (ExecutionException e) {
-                                LOGGER.log(Level.WARNING, "Provisioned slave " + f.displayName + " failed to launch",
+                                LOGGER.log(Level.WARNING, "Provisioned agent " + f.displayName + " failed to launch",
                                         e.getCause());
                                 for (CloudProvisioningListener cl : CloudProvisioningListener.all()) {
                                     cl.onFailure(f, e.getCause());
                                 }
                             } catch (IOException e) {
-                                LOGGER.log(Level.WARNING, "Provisioned slave " + f.displayName + " failed to launch", 
+                                LOGGER.log(Level.WARNING, "Provisioned agent " + f.displayName + " failed to launch", 
                                         e);
                                 for (CloudProvisioningListener cl : CloudProvisioningListener.all()) {
                                     cl.onFailure(f, e);
@@ -244,7 +244,7 @@ public class NodeProvisioner {
                                 throw e;
                             } catch (Throwable e) {
                                 LOGGER.log(Level.SEVERE, "Unexpected uncaught exception encountered while " 
-                                        + "processing provisioned slave " + f.displayName, e);
+                                        + "processing provisioned agent " + f.displayName, e);
                             } finally {
                                 while (true) {
                                     List<PlannedNode> orig = pendingLaunches.get();
@@ -607,23 +607,23 @@ public class NodeProvisioner {
         @Override
         public StrategyDecision apply(@Nonnull StrategyState state) {
         /*
-            Here we determine how many additional slaves we need to keep up with the load (if at all),
+            Here we determine how many additional agents we need to keep up with the load (if at all),
             which involves a simple math.
 
             Broadly speaking, first we check that all the executors are fully utilized before attempting
-            to start any new slave (this also helps to ignore the temporary gap between different numbers,
+            to start any new agent (this also helps to ignore the temporary gap between different numbers,
             as changes in them are not necessarily synchronized --- for example, there's a time lag between
-            when a slave launches (thus bringing the planned capacity down) and the time when its executors
+            when an agent launches (thus bringing the planned capacity down) and the time when its executors
             pick up builds (thus bringing the queue length down.)
 
-            Once we confirm that, we compare the # of buildable items against the additional slaves
-            that are being brought online. If we have more jobs than our executors can handle, we'll launch a new slave.
+            Once we confirm that, we compare the # of buildable items against the additional agents
+            that are being brought online. If we have more jobs than our executors can handle, we'll launch a new agent.
 
             So this computation involves three stats:
 
               1. # of idle executors
               2. # of jobs that are starving for executors
-              3. # of additional slaves being provisioned (planned capacities.)
+              3. # of additional agents being provisioned (planned capacities.)
 
             To ignore a temporary surge/drop, we make conservative estimates on each one of them. That is,
             we take the current snapshot value, and we take the current exponential moving average (EMA) value,
@@ -675,14 +675,14 @@ public class NodeProvisioner {
                     CLOUD:
                     for (Cloud c : Jenkins.getInstance().clouds) {
                         if (excessWorkload < 0) {
-                            break;  // enough slaves allocated
+                            break;  // enough agents allocated
                         }
 
                         // Make sure this cloud actually can provision for this label.
                         if (c.canProvision(state.getLabel())) {
                             // provisioning a new node should be conservative --- for example if excessWorkload is 1.4,
                             // we don't want to allocate two nodes but just one.
-                            // OTOH, because of the exponential decay, even when we need one slave,
+                            // OTOH, because of the exponential decay, even when we need one agent,
                             // excess workload is always
                             // something like 0.95, in which case we want to allocate one node.
                             // so the threshold here is 1-MARGIN, and hence floor(excessWorkload+MARGIN) is needed to
@@ -774,7 +774,7 @@ public class NodeProvisioner {
     @Extension
     public static class NodeProvisionerInvoker extends PeriodicWork {
         /**
-         * Give some initial warm up time so that statically connected slaves
+         * Give some initial warm up time so that statically connected agents
          * can be brought online before we start allocating more.
          */
     	 public static int INITIALDELAY = Integer.getInteger(NodeProvisioner.class.getName()+".initialDelay",LoadStatistics.CLOCK*10);
diff --git a/core/src/main/java/hudson/slaves/RetentionStrategy.java b/core/src/main/java/hudson/slaves/RetentionStrategy.java
index 6fb8f7c8eb..57dfde61af 100644
--- a/core/src/main/java/hudson/slaves/RetentionStrategy.java
+++ b/core/src/main/java/hudson/slaves/RetentionStrategy.java
@@ -48,7 +48,7 @@ import java.util.logging.Logger;
 public abstract class RetentionStrategy<T extends Computer> extends AbstractDescribableImpl<RetentionStrategy<?>> implements ExtensionPoint {
 
     /**
-     * This method will be called periodically to allow this strategy to decide what to do with it's owning slave.
+     * This method will be called periodically to allow this strategy to decide what to do with it's owning agent.
      *
      * @param c {@link Computer} for which this strategy is assigned. This computer may be online or offline.
      *          This object also exposes a bunch of properties that the callee can use to decide what action to take.
@@ -59,11 +59,11 @@ public abstract class RetentionStrategy<T extends Computer> extends AbstractDesc
     public abstract long check(T c);
 
     /**
-     * This method is called to determine whether manual launching of the slave is allowed at this point in time.
+     * This method is called to determine whether manual launching of the agent is allowed at this point in time.
      * @param c {@link Computer} for which this strategy is assigned. This computer may be online or offline.
      *          This object also exposes a bunch of properties that the callee can use to decide if manual launching is
      * allowed at this time.
-     * @return {@code true} if manual launching of the slave is allowed at this point in time.
+     * @return {@code true} if manual launching of the agent is allowed at this point in time.
      */
     public boolean isManualLaunchAllowed(T c) {
         return true;
@@ -85,7 +85,7 @@ public abstract class RetentionStrategy<T extends Computer> extends AbstractDesc
 
     /**
      * Called when a new {@link Computer} object is introduced (such as when Hudson started, or when
-     * a new slave is added.)
+     * a new agent is added.)
      *
      * <p>
      * The default implementation of this method delegates to {@link #check(Computer)},
@@ -180,12 +180,12 @@ public abstract class RetentionStrategy<T extends Computer> extends AbstractDesc
         private static final Logger logger = Logger.getLogger(Demand.class.getName());
 
         /**
-         * The delay (in minutes) for which the slave must be in demand before tring to launch it.
+         * The delay (in minutes) for which the agent must be in demand before tring to launch it.
          */
         private final long inDemandDelay;
 
         /**
-         * The delay (in minutes) for which the slave must be idle before taking it offline.
+         * The delay (in minutes) for which the agent must be idle before taking it offline.
          */
         private final long idleDelay;
 
diff --git a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java
index 5a1e804b79..9ab5878d52 100644
--- a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java
+++ b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java
@@ -45,7 +45,7 @@ import java.util.logging.Logger;
 import static java.util.logging.Level.INFO;
 
 /**
- * {@link RetentionStrategy} that controls the slave based on a schedule.
+ * {@link RetentionStrategy} that controls the agent based on a schedule.
  *
  * @author Stephen Connolly
  * @since 1.275
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index 7e161d9905..ed846e66de 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -99,7 +99,7 @@ public class SlaveComputer extends Computer {
     private Boolean isUnix;
     /**
      * Effective {@link ComputerLauncher} that hides the details of
-     * how we launch a slave agent on this computer.
+     * how we launch a agent agent on this computer.
      *
      * <p>
      * This is normally the same as {@link Slave#getLauncher()} but
@@ -162,7 +162,7 @@ public class SlaveComputer extends Computer {
     @Override
     @OverrideMustInvoke(When.ANYTIME)
     public boolean isAcceptingTasks() {
-        // our boolean flag is an override on any additional programmatic reasons why this slave might not be
+        // our boolean flag is an override on any additional programmatic reasons why this agent might not be
         // accepting tasks.
         return acceptingTasks && super.isAcceptingTasks();
     }
@@ -175,13 +175,13 @@ public class SlaveComputer extends Computer {
     }
 
     /**
-     * Allows suspension of tasks being accepted by the slave computer. While this could be called by a
+     * Allows suspension of tasks being accepted by the agent computer. While this could be called by a
      * {@linkplain hudson.slaves.ComputerLauncher} or a {@linkplain hudson.slaves.RetentionStrategy}, such usage
      * can result in fights between multiple actors calling setting differential values. A better approach
      * is to override {@link hudson.slaves.RetentionStrategy#isAcceptingTasks(hudson.model.Computer)} if the
      * {@link hudson.slaves.RetentionStrategy} needs to control availability.
      *
-     * @param acceptingTasks {@code true} if the slave can accept tasks.
+     * @param acceptingTasks {@code true} if the agent can accept tasks.
      */
     public void setAcceptingTasks(boolean acceptingTasks) {
         this.acceptingTasks = acceptingTasks;
@@ -274,7 +274,7 @@ public class SlaveComputer extends Computer {
                 }
 
                 if (channel==null)
-                    throw new IOException("Slave failed to connect, even though the launcher didn't report it. See the log output for details.");
+                    throw new IOException("Agent failed to connect, even though the launcher didn't report it. See the log output for details.");
                 return null;
             }
         });
@@ -350,7 +350,7 @@ public class SlaveComputer extends Computer {
     }
 
     /**
-     * Creates a {@link Channel} from the given stream and sets that to this slave.
+     * Creates a {@link Channel} from the given stream and sets that to this agent.
      *
      * @param in
      *      Stream connected to the remote "slave.jar". It's the caller's responsibility to do
@@ -426,11 +426,11 @@ public class SlaveComputer extends Computer {
     }
 
     /**
-     * Returns the remote FS root absolute path or {@code null} if the slave is off-line. The absolute path may change
+     * Returns the remote FS root absolute path or {@code null} if the agent is off-line. The absolute path may change
      * between connections if the connection method does not provide a consistent working directory and the node's
      * remote FS is specified as a relative path.
      *
-     * @return the remote FS root absolute path or {@code null} if the slave is off-line.
+     * @return the remote FS root absolute path or {@code null} if the agent is off-line.
      * @since 1.606
      */
     @CheckForNull
@@ -575,7 +575,7 @@ public class SlaveComputer extends Computer {
         } finally {
             SecurityContextHolder.setContext(old);
         }
-        log.println("Slave successfully connected and online");
+        log.println("Agent successfully connected and online");
         Jenkins.getInstance().getQueue().scheduleMaintenance();
     }
 
@@ -644,11 +644,11 @@ public class SlaveComputer extends Computer {
     }
 
     /**
-     * Serves jar files for JNLP slave agents.
+     * Serves jar files for JNLP agents.
      *
      * @deprecated since 2008-08-18.
      *      This URL binding is no longer used and moved up directly under to {@link jenkins.model.Jenkins},
-     *      but it's left here for now just in case some old JNLP slave agents request it.
+     *      but it's left here for now just in case some old JNLP agents request it.
      */
     @Deprecated
     public Slave.JnlpJar getJnlpJars(String fileName) {
@@ -669,7 +669,7 @@ public class SlaveComputer extends Computer {
         try {
             Util.deleteRecursive(getLogDir());
         } catch (IOException ex) {
-            logger.log(Level.WARNING, "Unable to delete slave logs", ex);
+            logger.log(Level.WARNING, "Unable to delete agent logs", ex);
         }
     }
 
@@ -706,7 +706,7 @@ public class SlaveComputer extends Computer {
         super.setNode(node);
         launcher = grabLauncher(node);
 
-        // maybe the configuration was changed to relaunch the slave, so try to re-launch now.
+        // maybe the configuration was changed to relaunch the agent, so try to re-launch now.
         // "constructed==null" test is an ugly hack to avoid launching before the object is fully
         // constructed.
         if(constructed!=null) {
@@ -740,7 +740,7 @@ public class SlaveComputer extends Computer {
     }
 
     /**
-     * Get the slave version
+     * Get the agent version
      */
     public String getSlaveVersion() throws IOException, InterruptedException {
         return channel.call(new SlaveVersion());
@@ -794,7 +794,7 @@ public class SlaveComputer extends Computer {
      */
     static final class LogHolder {
         /**
-         * This field is used on each slave node to record log records on the slave.
+         * This field is used on each agent to record logs on the agent.
          */
         static final RingBufferLogHandler SLAVE_LOG_HANDLER = new RingBufferLogHandler();
     }
@@ -827,9 +827,9 @@ public class SlaveComputer extends Computer {
 
     /**
      * Obtains a {@link VirtualChannel} that allows some computation to be performed on the master.
-     * This method can be called from any thread on the master, or from slave (more precisely,
-     * it only works from the remoting request-handling thread in slaves, which means if you've started
-     * separate thread on slaves, that'll fail.)
+     * This method can be called from any thread on the master, or from agent (more precisely,
+     * it only works from the remoting request-handling thread in agents, which means if you've started
+     * separate thread on agents, that'll fail.)
      *
      * @return null if the calling thread doesn't have any trace of where its master is.
      * @since 1.362
@@ -838,7 +838,7 @@ public class SlaveComputer extends Computer {
         if (Jenkins.getInstanceOrNull()!=null) // check if calling thread is on master or on slave
             return FilePath.localChannel;
 
-        // if this method is called from within the slave computation thread, this should work
+        // if this method is called from within the agent computation thread, this should work
         Channel c = Channel.current();
         if (c!=null && Boolean.TRUE.equals(c.getProperty("slave")))
             return c;
diff --git a/core/src/main/java/hudson/slaves/package.html b/core/src/main/java/hudson/slaves/package.html
index 9a8c33215d..a5080940f2 100644
--- a/core/src/main/java/hudson/slaves/package.html
+++ b/core/src/main/java/hudson/slaves/package.html
@@ -23,5 +23,5 @@ THE SOFTWARE.
 -->
 
 <html><head/><body>
-Code related to slaves.
+Code related to agents.
 </body></html>
\ No newline at end of file
diff --git a/core/src/main/java/hudson/tools/ToolDescriptor.java b/core/src/main/java/hudson/tools/ToolDescriptor.java
index 567c298a0d..641400f454 100644
--- a/core/src/main/java/hudson/tools/ToolDescriptor.java
+++ b/core/src/main/java/hudson/tools/ToolDescriptor.java
@@ -34,7 +34,10 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.List;
+
+import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
+import jenkins.tools.ToolConfigurationCategory;
 import net.sf.json.JSONObject;
 import org.jvnet.tiger_types.Types;
 import org.kohsuke.stapler.QueryParameter;
@@ -89,6 +92,12 @@ public abstract class ToolDescriptor<T extends ToolInstallation> extends Descrip
         return PropertyDescriptor.for_(ToolProperty.all(),clazz);
     }
 
+
+    @Override
+    public GlobalConfigurationCategory getCategory() {
+        return GlobalConfigurationCategory.get(ToolConfigurationCategory.class);
+    }
+
     /**
      * Optional list of installers to be configured by default for new tools of this type.
      * If there are popular versions of the tool available using generic installation techniques,
diff --git a/core/src/main/java/hudson/tools/ToolInstallation.java b/core/src/main/java/hudson/tools/ToolInstallation.java
index a14fed1c1b..e6f104dffc 100644
--- a/core/src/main/java/hudson/tools/ToolInstallation.java
+++ b/core/src/main/java/hudson/tools/ToolInstallation.java
@@ -53,8 +53,8 @@ import jenkins.model.Jenkins;
  * this class, but choosing this class as a base class has several benefits:
  *
  * <ul>
- * <li>Hudson allows admins to specify different locations for tools on some slaves.
- *     For example, JDK on the master might be on /usr/local/java but on a Windows slave
+ * <li>Hudson allows admins to specify different locations for tools on some agents.
+ *     For example, JDK on the master might be on /usr/local/java but on a Windows agent
  *     it could be at c:\Program Files\Java
  * <li>Hudson can verify the existence of tools and provide warnings and diagnostics for
  *     admins. (TBD)
diff --git a/core/src/main/java/hudson/tools/ToolInstaller.java b/core/src/main/java/hudson/tools/ToolInstaller.java
index 94da3ea494..2aaec73d1d 100644
--- a/core/src/main/java/hudson/tools/ToolInstaller.java
+++ b/core/src/main/java/hudson/tools/ToolInstaller.java
@@ -97,7 +97,7 @@ public abstract class ToolInstaller implements Describable<ToolInstaller>, Exten
      * @return the (directory) path at which the tool can be found,
      *         typically coming from {@link #preferredLocation}
      * @throws IOException if installation fails
-     * @throws InterruptedException if communication with a slave is interrupted
+     * @throws InterruptedException if communication with a agent is interrupted
      */
     public abstract FilePath performInstallation(ToolInstallation tool, Node node, TaskListener log) throws IOException, InterruptedException;
 
diff --git a/core/src/main/java/hudson/util/ClockDifference.java b/core/src/main/java/hudson/util/ClockDifference.java
index 444d101494..ee56d328d0 100644
--- a/core/src/main/java/hudson/util/ClockDifference.java
+++ b/core/src/main/java/hudson/util/ClockDifference.java
@@ -41,8 +41,8 @@ public final class ClockDifference {
     /**
      * The difference in milliseconds.
      *
-     * Positive value means the slave is behind the master,
-     * negative value means the slave is ahead of the master.
+     * Positive value means the agent is behind the master,
+     * negative value means the agent is ahead of the master.
      */
     @Exported
     public final long diff;
diff --git a/core/src/main/java/hudson/util/HttpResponses.java b/core/src/main/java/hudson/util/HttpResponses.java
index 16755adc4c..1fb7cf6084 100644
--- a/core/src/main/java/hudson/util/HttpResponses.java
+++ b/core/src/main/java/hudson/util/HttpResponses.java
@@ -23,10 +23,18 @@
  */
 package hudson.util;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 
+import javax.annotation.Nonnull;
+import javax.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Map;
 
 /**
  * Various {@link HttpResponse} implementations.
@@ -40,4 +48,126 @@ public class HttpResponses extends org.kohsuke.stapler.HttpResponses {
     public static HttpResponse staticResource(File f) throws IOException {
         return staticResource(f.toURI().toURL());
     }
+
+    /**
+     * Create an empty "ok" response.
+     */
+    public static HttpResponse okJSON() {
+        return new JSONObjectResponse();
+    }
+
+    /**
+     * Create a response containing the supplied "data".
+     * @param data The data.
+     */
+    public static HttpResponse okJSON(@Nonnull JSONObject data) {
+        return new JSONObjectResponse(data);
+    }
+
+    /**
+     * Create a response containing the supplied "data".
+     * @param data The data.
+     */
+    public static HttpResponse okJSON(@Nonnull JSONArray data) {
+        return new JSONObjectResponse(data);
+    }
+
+    /**
+     * Create a response containing the supplied "data".
+     * @param data The data.
+     */
+    public static HttpResponse okJSON(@Nonnull Map<?,?> data) {
+        return new JSONObjectResponse(data);
+    }
+
+        /**
+         * Set the response as an error response.
+         * @param message The error "message" set on the response.
+         * @return {@link this} object.
+         */
+    public static HttpResponse errorJSON(@Nonnull String message) {
+        return new JSONObjectResponse().error(message);
+    }
+
+    /**
+     * {@link net.sf.json.JSONObject} response.
+     *
+     * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+     */
+    static class JSONObjectResponse implements HttpResponse {
+
+        private static final Charset UTF8 = Charset.forName("UTF-8");
+
+        private final JSONObject jsonObject;
+
+        /**
+         * Create an empty "ok" response.
+         */
+        JSONObjectResponse() {
+            this.jsonObject = new JSONObject();
+            status("ok");
+        }
+
+        /**
+         * Create a response containing the supplied "data".
+         * @param data The data.
+         */
+        JSONObjectResponse(@Nonnull JSONObject data) {
+            this();
+            this.jsonObject.put("data", data);
+        }
+
+        /**
+         * Create a response containing the supplied "data".
+         * @param data The data.
+         */
+        JSONObjectResponse(@Nonnull JSONArray data) {
+            this();
+            this.jsonObject.put("data", data);
+        }
+
+        /**
+         * Create a response containing the supplied "data".
+         * @param data The data.
+         */
+        JSONObjectResponse(@Nonnull Map<?,?> data) {
+            this();
+            this.jsonObject.put("data", JSONObject.fromObject(data));
+        }
+
+        /**
+         * Set the response as an error response.
+         * @param message The error "message" set on the response.
+         * @return {@link this} object.
+         */
+        @Nonnull JSONObjectResponse error(@Nonnull String message) {
+            status("error");
+            this.jsonObject.put("message", message);
+            return this;
+        }
+
+        /**
+         * Get the JSON response object.
+         * @return The JSON response object.
+         */
+        @Nonnull JSONObject getJsonObject() {
+            return jsonObject;
+        }
+
+        private @Nonnull JSONObjectResponse status(@Nonnull String status) {
+            this.jsonObject.put("status", status);
+            return this;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+            byte[] bytes = jsonObject.toString().getBytes(UTF8);
+            rsp.setContentType("application/json; charset=UTF-8");
+            rsp.setContentLength(bytes.length);
+            rsp.getOutputStream().write(bytes);
+        }
+    }
 }
diff --git a/core/src/main/java/hudson/util/ProcessKiller.java b/core/src/main/java/hudson/util/ProcessKiller.java
index 1aeb8f7815..a6fd99a542 100644
--- a/core/src/main/java/hudson/util/ProcessKiller.java
+++ b/core/src/main/java/hudson/util/ProcessKiller.java
@@ -38,7 +38,7 @@ import java.io.Serializable;
  * <p>
  * Each implementation of {@link ProcessKiller} is instantiated once on the master.
  * Whenever a process needs to be killed, those implementations are serialized and sent over
- * to the appropriate slave, then the {@link #kill(ProcessTree.OSProcess)} method is invoked
+ * to the appropriate agent, then the {@link #kill(ProcessTree.OSProcess)} method is invoked
  * to attempt to kill the process.
  *
  * <p>
diff --git a/core/src/main/java/hudson/util/RemotingDiagnostics.java b/core/src/main/java/hudson/util/RemotingDiagnostics.java
index 8a2a51aa28..ed3a4c814b 100644
--- a/core/src/main/java/hudson/util/RemotingDiagnostics.java
+++ b/core/src/main/java/hudson/util/RemotingDiagnostics.java
@@ -61,7 +61,7 @@ import java.util.TreeMap;
  * Various remoting operations related to diagnostics.
  *
  * <p>
- * These code are useful wherever {@link VirtualChannel} is used, such as master, slaves, Maven JVMs, etc.
+ * These code are useful wherever {@link VirtualChannel} is used, such as master, agents, Maven JVMs, etc.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.175
diff --git a/core/src/main/java/hudson/util/spring/BeanBuilder.java b/core/src/main/java/hudson/util/spring/BeanBuilder.java
index e1d1cba514..38482703fd 100644
--- a/core/src/main/java/hudson/util/spring/BeanBuilder.java
+++ b/core/src/main/java/hudson/util/spring/BeanBuilder.java
@@ -39,6 +39,7 @@ import org.springframework.web.context.WebApplicationContext;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -132,7 +133,7 @@ public class BeanBuilder extends GroovyObjectSupport {
         cc.setScriptBaseClass(ClosureScript.class.getName());
         GroovyShell shell = new GroovyShell(classLoader,binding,cc);
 
-        ClosureScript s = (ClosureScript)shell.parse(script);
+        ClosureScript s = (ClosureScript)shell.parse(new InputStreamReader(script));
         s.setDelegate(this);
         s.run();
     }
@@ -336,7 +337,7 @@ public class BeanBuilder extends GroovyObjectSupport {
 
 		GroovyShell shell = classLoader != null ? new GroovyShell(classLoader,b) : new GroovyShell(b);
         for (Resource resource : resources) {
-            shell.evaluate(resource.getInputStream());
+            shell.evaluate(new InputStreamReader(resource.getInputStream()));
         }
 	}
 
diff --git a/core/src/main/java/jenkins/I18n.java b/core/src/main/java/jenkins/I18n.java
new file mode 100644
index 0000000000..299b7328e3
--- /dev/null
+++ b/core/src/main/java/jenkins/I18n.java
@@ -0,0 +1,113 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins;
+
+import hudson.Extension;
+import hudson.model.RootAction;
+import hudson.util.HttpResponses;
+import jenkins.util.ResourceBundleUtil;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.StaplerRequest;
+
+import java.util.Locale;
+
+/**
+ * Internationalization REST (ish) API.
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ * @since FIXME
+ */
+@Extension
+@Restricted(NoExternalUse.class)
+public class I18n implements RootAction {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getIconFileName() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getDisplayName() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getUrlName() {
+        return "i18n";
+    }
+
+    /**
+     * Get a localised resource bundle.
+     * <p>
+     * URL: {@code i18n/resourceBundle}.
+     * <p>
+     * Parameters:
+     * <ul>
+     *     <li>{@code baseName}: The resource bundle base name.</li>
+     *     <li>{@code language}: {@link Locale} Language. (optional)</li>
+     *     <li>{@code country}: {@link Locale} Country. (optional)</li>
+     *     <li>{@code variant}: {@link Locale} Language variant. (optional)</li>
+     * </ul>
+     *
+     * @param request The request.
+     * @return The JSON response.
+     */
+    public HttpResponse doResourceBundle(StaplerRequest request) {
+        String baseName = request.getParameter("baseName");
+
+        if (baseName == null) {
+            return HttpResponses.errorJSON("Mandatory parameter 'baseName' not specified.");
+        }
+
+        String language = request.getParameter("language");
+        String country = request.getParameter("country");
+        String variant = request.getParameter("variant");
+
+        try {
+            Locale locale = request.getLocale();
+
+            if (language != null && country != null && variant != null) {
+                locale = new Locale(language, country, variant);
+            } else if (language != null && country != null) {
+                locale = new Locale(language, country);
+            } else if (language != null) {
+                locale = new Locale(language);
+            }
+
+            return HttpResponses.okJSON(ResourceBundleUtil.getBundle(baseName, locale));
+        } catch (Exception e) {
+            return HttpResponses.errorJSON(e.getMessage());
+        }
+    }
+}
diff --git a/core/src/main/java/jenkins/SlaveToMasterFileCallable.java b/core/src/main/java/jenkins/SlaveToMasterFileCallable.java
index f196a88cf3..bda39cff47 100644
--- a/core/src/main/java/jenkins/SlaveToMasterFileCallable.java
+++ b/core/src/main/java/jenkins/SlaveToMasterFileCallable.java
@@ -5,7 +5,7 @@ import jenkins.security.Roles;
 import org.jenkinsci.remoting.RoleChecker;
 
 /**
- * {@link FileCallable}s that can be executed on the master, sent by the slave.
+ * {@link FileCallable}s that can be executed on the master, sent by the agent.
  *
  * @since 1.THU
  */
diff --git a/core/src/main/java/jenkins/SoloFilePathFilter.java b/core/src/main/java/jenkins/SoloFilePathFilter.java
index c2cfa58ef0..9897284582 100644
--- a/core/src/main/java/jenkins/SoloFilePathFilter.java
+++ b/core/src/main/java/jenkins/SoloFilePathFilter.java
@@ -28,7 +28,7 @@ public final class SoloFilePathFilter extends FilePathFilter {
 
     private boolean noFalse(String op, File f, boolean b) {
         if (!b)
-            throw new SecurityException("slave may not " + op + " " + f+"\nSee http://jenkins-ci.org/security-144 for more details");
+            throw new SecurityException("agent may not " + op + " " + f+"\nSee http://jenkins-ci.org/security-144 for more details");
         return true;
     }
 
diff --git a/core/src/main/java/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor.java b/core/src/main/java/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor.java
deleted file mode 100644
index 0fb30e10fb..0000000000
--- a/core/src/main/java/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package jenkins.diagnostics;
-
-import com.google.common.collect.ImmutableList;
-import hudson.Extension;
-import hudson.PluginWrapper;
-import hudson.model.AdministrativeMonitor;
-import jenkins.model.Jenkins;
-
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Fires off when we have any pinned plugins that's blocking upgrade from the bundled version.
- *
- * @author Kohsuke Kawaguchi
- */
-@Extension
-public class PinningIsBlockingBundledPluginMonitor extends AdministrativeMonitor {
-    @Inject
-    Jenkins jenkins;
-
-    private List<PluginWrapper> offenders;
-
-    @Override
-    public boolean isActivated() {
-        return !getOffenders().isEmpty();
-    }
-
-    private void compute() {
-        List<PluginWrapper> offenders = new ArrayList<PluginWrapper>();
-        for (PluginWrapper p : jenkins.pluginManager.getPlugins()) {
-            if (p.isPinningForcingOldVersion())
-                offenders.add(p);
-        }
-        this.offenders = ImmutableList.copyOf(offenders);
-    }
-
-    public List<PluginWrapper> getOffenders() {
-        if (offenders==null)
-            compute();
-        return offenders;
-    }
-}
diff --git a/core/src/main/java/jenkins/install/InstallState.java b/core/src/main/java/jenkins/install/InstallState.java
new file mode 100644
index 0000000000..42d223815f
--- /dev/null
+++ b/core/src/main/java/jenkins/install/InstallState.java
@@ -0,0 +1,103 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins.install;
+
+import javax.annotation.CheckForNull;
+
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+/**
+ * Jenkins install state.
+ *
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ */
+@Restricted(NoExternalUse.class)
+public enum InstallState {
+    /**
+     * Need InstallState != NEW for tests by default
+     */
+    UNKNOWN(true, null),
+    /**
+     * The initial set up has been completed
+     */
+    INITIAL_SETUP_COMPLETED(true, null),
+    /**
+     * Creating an admin user for an initial Jenkins install.
+     */
+    CREATE_ADMIN_USER(false, INITIAL_SETUP_COMPLETED),
+    /**
+     * New Jenkins install. The user has kicked off the process of installing an
+     * initial set of plugins (via the install wizard).
+     */
+    INITIAL_PLUGINS_INSTALLING(false, CREATE_ADMIN_USER),
+    /**
+     * New Jenkins install.
+     */
+    NEW(false, INITIAL_PLUGINS_INSTALLING),
+    /**
+     * Restart of an existing Jenkins install.
+     */
+    RESTART(true, INITIAL_SETUP_COMPLETED),
+    /**
+     * Upgrade of an existing Jenkins install.
+     */
+    UPGRADE(true, INITIAL_SETUP_COMPLETED),
+    /**
+     * Downgrade of an existing Jenkins install.
+     */
+    DOWNGRADE(true, INITIAL_SETUP_COMPLETED),
+    /**
+     * Jenkins started in test mode (JenkinsRule).
+     */
+    TEST(true, INITIAL_SETUP_COMPLETED),
+    /**
+     * Jenkins started in development mode: Bolean.getBoolean("hudson.Main.development").
+     * Can be run normally with the -Djenkins.install.runSetupWizard=true
+     */
+    DEVELOPMENT(true, INITIAL_SETUP_COMPLETED);
+
+    private final boolean isSetupComplete;
+    private final InstallState nextState;
+
+    private InstallState(boolean isSetupComplete, InstallState nextState) {
+        this.isSetupComplete = isSetupComplete;
+        this.nextState = nextState;
+    }
+
+    /**
+     * Indicates the initial setup is complete
+     */
+    public boolean isSetupComplete() {
+        return isSetupComplete;
+    }
+    
+    /**
+     * Gets the next state
+     */
+    @CheckForNull
+    public InstallState getNextState() {
+        return nextState;
+    }
+}
diff --git a/core/src/main/java/jenkins/install/InstallUtil.java b/core/src/main/java/jenkins/install/InstallUtil.java
new file mode 100644
index 0000000000..0b7a2d84f5
--- /dev/null
+++ b/core/src/main/java/jenkins/install/InstallUtil.java
@@ -0,0 +1,301 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins.install;
+
+import static java.util.logging.Level.SEVERE;
+import static java.util.logging.Level.WARNING;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import org.apache.commons.io.FileUtils;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+import com.thoughtworks.xstream.XStream;
+
+import hudson.Functions;
+import hudson.model.UpdateCenter.DownloadJob.InstallationStatus;
+import hudson.model.UpdateCenter.DownloadJob.Installing;
+import hudson.security.AuthorizationStrategy;
+import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
+import hudson.security.HudsonPrivateSecurityRealm;
+import hudson.security.SecurityRealm;
+import hudson.model.UpdateCenter.InstallationJob;
+import hudson.model.UpdateCenter.UpdateCenterJob;
+import hudson.util.VersionNumber;
+import jenkins.model.Jenkins;
+import jenkins.util.xml.XMLUtils;
+
+/**
+ * Jenkins install utilities.
+ *
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ */
+@Restricted(NoExternalUse.class)
+public class InstallUtil {
+
+    private static final Logger LOGGER = Logger.getLogger(InstallUtil.class.getName());
+
+    // tests need this to be 1.0
+    private static final VersionNumber NEW_INSTALL_VERSION = new VersionNumber("1.0");
+
+    /**
+     * Get the current installation state.
+     * @return The type of "startup" currently under way in Jenkins.
+     */
+    public static InstallState getInstallState() {
+        // Support a simple state override. Useful for testing.
+        String stateOverride = System.getenv("jenkins.install.state");
+        if (stateOverride != null) {
+            try {
+                return InstallState.valueOf(stateOverride.toUpperCase());
+            } catch (RuntimeException e) {
+                throw new IllegalStateException("Unknown install state override specified on the commandline: '" + stateOverride + "'.");
+            }
+        }
+        
+        // Support a 3-state flag for running or disabling the setup wizard
+        String shouldRunFlag = System.getProperty("jenkins.install.runSetupWizard");
+        boolean shouldRun = "true".equalsIgnoreCase(shouldRunFlag);
+        boolean shouldNotRun = "false".equalsIgnoreCase(shouldRunFlag);
+        
+        // install wizard will always run if environment specified
+        if (!shouldRun) {
+            if (Functions.getIsUnitTest()) {
+                return InstallState.TEST;
+            }
+            
+            if (Boolean.getBoolean("hudson.Main.development")) {
+                return InstallState.DEVELOPMENT;
+            }
+        }
+
+        VersionNumber lastRunVersion = new VersionNumber(getLastExecVersion());
+
+        // Neither the top level config or the lastExecVersionFile have a version
+        // stored in them, which means it's a new install.
+        if (lastRunVersion.compareTo(NEW_INSTALL_VERSION) == 0) {
+            Jenkins j = Jenkins.getInstance();
+            
+            // Allow for skipping
+            if(shouldNotRun) {
+                try {
+                    SetupWizard.completeSetup(j);
+                    UpgradeWizard.completeUpgrade(j);
+                    return j.getInstallState();
+                } catch (RuntimeException e) {
+                    throw e;
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
+            // Edge case: used Jenkins 1 but did not save the system config page,
+            // the version is not persisted and returns 1.0, so try to check if
+            // they actually did anything
+            if (!j.getItemMap().isEmpty() || !mayBeJenkins2SecurityDefaults(j)) {
+                return InstallState.UPGRADE;
+            }
+            return InstallState.NEW;
+        }
+
+        // We have a last version.
+
+        VersionNumber currentRunVersion = new VersionNumber(getCurrentExecVersion());
+        if (lastRunVersion.isOlderThan(currentRunVersion)) {
+            return InstallState.UPGRADE;
+        } else if (lastRunVersion.isNewerThan(currentRunVersion)) {
+            return InstallState.DOWNGRADE;
+        } else {
+            // Last running version was the same as "this" running version.
+            return InstallState.RESTART;
+        }
+    }
+
+    /**
+     * This could be an upgrade, detect a non-default security realm for the stupid case
+     * where someone installed 1.x and did not save global config or create any items...
+     */
+    private static boolean mayBeJenkins2SecurityDefaults(Jenkins j) {
+        if(j.getSecurityRealm() == SecurityRealm.NO_AUTHENTICATION) { // called before security set up first
+            return true;
+        }
+        if(j.getSecurityRealm() instanceof HudsonPrivateSecurityRealm) { // might be called after a restart, setup isn't complete
+            HudsonPrivateSecurityRealm securityRealm = (HudsonPrivateSecurityRealm)j.getSecurityRealm();
+            if(securityRealm.getAllUsers().size() == 1 && securityRealm.getUser(SetupWizard.initialSetupAdminUserName) != null) {
+                AuthorizationStrategy authStrategy = j.getAuthorizationStrategy();
+                if(authStrategy instanceof FullControlOnceLoggedInAuthorizationStrategy) {
+                    // must have been using 2.0+ to set this, as it wasn't present in 1.x and the default is true, to _allow_ anon read
+                    if(!((FullControlOnceLoggedInAuthorizationStrategy)authStrategy).isAllowAnonymousRead()) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Save the current Jenkins instance version as the last executed version.
+     * <p>
+     * This state information is required in order to determine whether or not the Jenkins instance
+     * is just restarting, or is being upgraded from an earlier version.
+     */
+    public static void saveLastExecVersion() {
+        if (Jenkins.VERSION.equals(Jenkins.UNCOMPUTED_VERSION)) {
+            // This should never happen!! Only adding this check in case someone moves the call to this method to the wrong place.
+            throw new IllegalStateException("Unexpected call to InstallUtil.saveLastExecVersion(). Jenkins.VERSION has not been initialized. Call computeVersion() first.");
+        }
+        saveLastExecVersion(Jenkins.VERSION);
+    }
+
+    /**
+     * Get the last saved Jenkins instance version.
+     * @return The last saved Jenkins instance version.
+     * @see #saveLastExecVersion()
+     */
+    public static @Nonnull String getLastExecVersion() {
+        File lastExecVersionFile = getLastExecVersionFile();
+        if (lastExecVersionFile.exists()) {
+            try {
+                return FileUtils.readFileToString(lastExecVersionFile);
+            } catch (IOException e) {
+                LOGGER.log(SEVERE, "Unexpected Error. Unable to read " + lastExecVersionFile.getAbsolutePath(), e);
+                LOGGER.log(WARNING, "Unable to determine the last running version (see error above). Treating this as a restart. No plugins will be updated.");
+                return getCurrentExecVersion();
+            }
+        } else {
+            // Backward compatibility. Use the last version stored in the top level config.xml.
+            // Going to read the value directly from the config.xml file Vs hoping that the
+            // Jenkins startup sequence has moved far enough along that it has loaded the
+            // global config. It can't load the global config until well into the startup
+            // sequence because the unmarshal requires numerous objects to be created e.g.
+            // it requires the Plugin Manager. It happens too late and it's too risky to
+            // change how it currently works.
+            File configFile = getConfigFile();
+            if (configFile.exists()) {
+                try {
+                    String lastVersion = XMLUtils.getValue("/hudson/version", configFile);
+                    if (lastVersion.length() > 0) {
+                        return lastVersion;
+                    }
+                } catch (Exception e) {
+                    LOGGER.log(SEVERE, "Unexpected error reading global config.xml", e);
+                }
+            }
+            return NEW_INSTALL_VERSION.toString();
+        }
+    }
+
+    /**
+     * Save a specific version as the last execute version.
+     * @param version The version to save.
+     */
+    static void saveLastExecVersion(@Nonnull String version) {
+        File lastExecVersionFile = getLastExecVersionFile();
+        try {
+            FileUtils.write(lastExecVersionFile, version);
+        } catch (IOException e) {
+            LOGGER.log(SEVERE, "Failed to save " + lastExecVersionFile.getAbsolutePath(), e);
+        }
+    }
+
+    static File getConfigFile() {
+        return new File(Jenkins.getInstance().getRootDir(), "config.xml");
+    }
+
+    static File getLastExecVersionFile() {
+        return new File(Jenkins.getInstance().getRootDir(), "jenkins.install.InstallUtil.lastExecVersion");
+    }
+
+    static File getInstallingPluginsFile() {
+        return new File(Jenkins.getInstance().getRootDir(), "jenkins.install.InstallUtil.installingPlugins");
+    }
+
+    private static String getCurrentExecVersion() {
+        if (Jenkins.VERSION.equals(Jenkins.UNCOMPUTED_VERSION)) {
+            // This should never happen!! Only adding this check in case someone moves the call to this method to the wrong place.
+            throw new IllegalStateException("Unexpected call to InstallUtil.getCurrentExecVersion(). Jenkins.VERSION has not been initialized. Call computeVersion() first.");
+        }
+        return Jenkins.VERSION;
+    }
+
+    /**
+     * Returns a list of any plugins that are persisted in the installing list
+     */
+    @SuppressWarnings("unchecked")
+	public static synchronized @CheckForNull Map<String,String> getPersistedInstallStatus() {
+        File installingPluginsFile = getInstallingPluginsFile();
+        if(installingPluginsFile == null || !installingPluginsFile.exists()) {
+		return null;
+        }
+        return (Map<String,String>)new XStream().fromXML(installingPluginsFile);
+    }
+
+    /**
+     * Persists a list of installing plugins; this is used in the case Jenkins fails mid-installation and needs to be restarted
+     * @param installingPlugins
+     */
+    public static synchronized void persistInstallStatus(List<UpdateCenterJob> installingPlugins) {
+        File installingPluginsFile = getInstallingPluginsFile();
+	if(installingPlugins == null || installingPlugins.isEmpty()) {
+		installingPluginsFile.delete();
+		return;
+	}
+	LOGGER.fine("Writing install state to: " + installingPluginsFile.getAbsolutePath());
+	Map<String,String> statuses = new HashMap<String,String>();
+	for(UpdateCenterJob j : installingPlugins) {
+		if(j instanceof InstallationJob && j.getCorrelationId() != null) { // only include install jobs with a correlation id (directly selected)
+			InstallationJob ij = (InstallationJob)j;
+			InstallationStatus status = ij.status;
+			String statusText = status.getType();
+			if(status instanceof Installing) { // flag currently installing plugins as pending
+				statusText = "Pending";
+			}
+			statuses.put(ij.plugin.name, statusText);
+		}
+	}
+        try {
+		String installingPluginXml = new XStream().toXML(statuses);
+            FileUtils.write(installingPluginsFile, installingPluginXml);
+        } catch (IOException e) {
+            LOGGER.log(SEVERE, "Failed to save " + installingPluginsFile.getAbsolutePath(), e);
+        }
+    }
+
+    /**
+     * Call to remove any active install status
+     */
+	public static void clearInstallStatus() {
+		persistInstallStatus(null);
+	}
+}
diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java
new file mode 100644
index 0000000000..b2faacbeb4
--- /dev/null
+++ b/core/src/main/java/jenkins/install/SetupWizard.java
@@ -0,0 +1,248 @@
+package jenkins.install;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import org.acegisecurity.Authentication;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
+
+import hudson.BulkChange;
+import hudson.FilePath;
+import hudson.model.UpdateCenter;
+import hudson.model.User;
+import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
+import hudson.security.HudsonPrivateSecurityRealm;
+import hudson.security.SecurityRealm;
+import hudson.security.csrf.DefaultCrumbIssuer;
+import hudson.util.HttpResponses;
+import hudson.util.PluginServletFilter;
+import hudson.util.VersionNumber;
+import jenkins.model.Jenkins;
+import jenkins.security.s2m.AdminWhitelistRule;
+
+/**
+ * A Jenkins instance used during first-run to provide a limited set of services while
+ * initial installation is in progress
+ * 
+ * @since 2.0
+ */
+@Restricted(NoExternalUse.class)
+public class SetupWizard {
+    /**
+     * The security token parameter name
+     */
+    public static String initialSetupAdminUserName = "admin";
+
+    private final Logger LOGGER = Logger.getLogger(SetupWizard.class.getName());
+
+    private final Jenkins jenkins;
+
+    public SetupWizard(Jenkins j) throws IOException, InterruptedException {
+        this.jenkins = j;
+
+        UpgradeWizard.completeUpgrade(j);
+        
+        // Create an admin user by default with a 
+        // difficult password
+        FilePath iapf = getInitialAdminPasswordFile();
+        if(j.getSecurityRealm() == null || j.getSecurityRealm() == SecurityRealm.NO_AUTHENTICATION) { // this seems very fragile
+            BulkChange bc = new BulkChange(j);
+            try{
+                HudsonPrivateSecurityRealm securityRealm = new HudsonPrivateSecurityRealm(false, false, null);
+                j.setSecurityRealm(securityRealm);
+                String randomUUID = UUID.randomUUID().toString().replace("-", "").toLowerCase(Locale.ENGLISH);
+
+                // create an admin user
+                securityRealm.createAccount(SetupWizard.initialSetupAdminUserName, randomUUID);
+
+                // JENKINS-33599 - write to a file in the jenkins home directory
+                // most native packages of Jenkins creates a machine user account 'jenkins' to run Jenkins,
+                // and use group 'jenkins' for admins. So we allo groups to read this file
+                iapf.touch(System.currentTimeMillis());
+                iapf.chmod(0640);
+                iapf.write(randomUUID + System.lineSeparator(), "UTF-8");
+                
+
+                // Lock Jenkins down:
+                FullControlOnceLoggedInAuthorizationStrategy authStrategy = new FullControlOnceLoggedInAuthorizationStrategy();
+                authStrategy.setAllowAnonymousRead(false);
+                j.setAuthorizationStrategy(authStrategy);
+
+                // Shut down all the ports we can by default:
+                j.setSlaveAgentPort(-1); // -1 to disable
+
+                // require a crumb issuer
+                j.setCrumbIssuer(new DefaultCrumbIssuer(false));
+
+                // set master -> slave security:
+                j.getInjector().getInstance(AdminWhitelistRule.class)
+                    .setMasterKillSwitch(false);
+            
+                j.save(); // !!
+                bc.commit();
+            } finally {
+                bc.abort();
+            }
+        }
+
+        if(iapf.exists()) {
+            String setupKey = iapf.readToString().trim();
+            String ls = System.lineSeparator();
+            LOGGER.info(ls + ls + "*************************************************************" + ls
+                    + "*************************************************************" + ls
+                    + "*************************************************************" + ls
+                    + ls
+                    + "Jenkins initial setup is required. An admin user has been created and "
+                    + "a password generated." + ls
+                    + "Please use the following password to proceed to installation:" + ls
+                    + ls
+                    + setupKey + ls
+                    + ls
+                    + "This may also be found at: " + iapf.getRemote() + ls
+                    + ls
+                    + "*************************************************************" + ls
+                    + "*************************************************************" + ls
+                    + "*************************************************************" + ls);
+        }
+        
+        try {
+            PluginServletFilter.addFilter(FORCE_SETUP_WIZARD_FILTER);
+        } catch (ServletException e) {
+            throw new AssertionError(e);
+        }
+        
+        try {
+            // Make sure plugin metadata is up to date
+            UpdateCenter.updateDefaultSite();
+        } catch (Exception e) {
+            LOGGER.log(Level.WARNING, e.getMessage(), e);
+        }
+    }
+    
+    /**
+     * Indicates a generated password should be used - e.g. this is a new install, no security realm set up
+     */
+    public boolean useGeneratedPassword() {
+        try {
+            return getInitialAdminPasswordFile().exists();
+        } catch (Exception e) {
+            // ignore
+        }
+        return false;
+    }
+    
+    /**
+     * Called during the initial setup to create an admin user
+     */
+    public void doCreateAdminUser(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        Jenkins j = Jenkins.getInstance();
+        j.checkPermission(Jenkins.ADMINISTER);
+        
+        // This will be set up by default. if not, something changed, ok to fail
+        HudsonPrivateSecurityRealm securityRealm = (HudsonPrivateSecurityRealm)j.getSecurityRealm();
+        
+        User admin = securityRealm.getUser(SetupWizard.initialSetupAdminUserName);
+        try {
+            if(admin != null) {
+                admin.delete(); // assume the new user may well be 'admin'
+            }
+            
+            User u = securityRealm.createAccountByAdmin(req, rsp, "/jenkins/install/SetupWizard/setupWizardFirstUser.jelly", req.getContextPath() + "/");
+            if (u != null) {
+                if(admin != null) {
+                    admin = null;
+                }
+                
+                // Success! Delete the temporary password file:
+                try {
+                    getInitialAdminPasswordFile().delete();
+                } catch (InterruptedException e) {
+                    throw new IOException(e);
+                }
+                
+                j.setInstallState(InstallState.CREATE_ADMIN_USER.getNextState());
+                
+                // ... and then login
+                Authentication a = new UsernamePasswordAuthenticationToken(u.getId(),req.getParameter("password1"));
+                a = securityRealm.getSecurityComponents().manager.authenticate(a);
+                SecurityContextHolder.getContext().setAuthentication(a);
+            }
+        } finally {
+            if(admin != null) {
+                admin.save(); // recreate this initial user if something failed
+            }
+        }
+    }
+
+    /**
+     * Gets the file used to store the initial admin password
+     */
+    public FilePath getInitialAdminPasswordFile() {
+        return jenkins.getRootPath().child("secrets/initialAdminPassword");
+    }
+
+    /**
+     * Remove the setupWizard filter, ensure all updates are written to disk, etc
+     */
+    public HttpResponse doCompleteInstall() throws IOException, ServletException {
+        completeSetup(jenkins);
+        PluginServletFilter.removeFilter(FORCE_SETUP_WIZARD_FILTER);
+        return HttpResponses.okJSON();
+    }
+    
+    static void completeSetup(Jenkins jenkins) {
+        jenkins.setInstallState(InstallState.INITIAL_SETUP_COMPLETED);
+        InstallUtil.saveLastExecVersion();
+        // Also, clean up the setup wizard if it's completed
+        jenkins.setSetupWizard(null);
+    }
+    
+    /**
+     * This filter will validate that the security token is provided
+     */
+    private final Filter FORCE_SETUP_WIZARD_FILTER = new Filter() {
+        @Override
+        public void init(FilterConfig cfg) throws ServletException {
+        }
+
+        @Override
+        public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+            // Force root requests to the setup wizard
+            if (request instanceof HttpServletRequest) {
+                HttpServletRequest req = (HttpServletRequest)request;
+                if((req.getContextPath() + "/").equals(req.getRequestURI())) {
+                    chain.doFilter(new HttpServletRequestWrapper(req) {
+                        public String getRequestURI() {
+                            return getContextPath() + "/setupWizard/";
+                        }
+                    }, response);
+                    return;
+                }
+                // fall through to handling the request normally
+            }
+            chain.doFilter(request, response);
+        }
+
+        @Override
+        public void destroy() {
+        }
+    };
+}
diff --git a/core/src/main/java/jenkins/install/UpgradeWizard.java b/core/src/main/java/jenkins/install/UpgradeWizard.java
new file mode 100644
index 0000000000..b2f47b3b04
--- /dev/null
+++ b/core/src/main/java/jenkins/install/UpgradeWizard.java
@@ -0,0 +1,160 @@
+package jenkins.install;
+
+import hudson.Extension;
+import hudson.model.PageDecorator;
+import hudson.model.UpdateSite.Plugin;
+import hudson.util.HttpResponses;
+import hudson.util.VersionNumber;
+import jenkins.model.Jenkins;
+import org.apache.commons.io.FileUtils;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.WebApp;
+import org.kohsuke.stapler.interceptor.RequirePOST;
+
+import javax.inject.Inject;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+import static java.util.logging.Level.*;
+import static org.apache.commons.io.FileUtils.*;
+import static org.apache.commons.lang.StringUtils.*;
+
+/**
+ * This is a stop-gap measure until JENKINS-33663 comes in.
+ * This call may go away. Please don't use it from outside.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@Restricted(NoExternalUse.class)
+@Extension
+public class UpgradeWizard extends PageDecorator {
+    @Inject
+    private Jenkins jenkins;
+
+    /**
+     * Is this instance fully upgraded?
+     */
+    private volatile boolean upToDate;
+
+    /**
+     * File that captures the state of upgrade.
+     *
+     * This file records the vesrion number that the installation has upgraded to.
+     */
+    /*package*/ File getStateFile() {
+        return new File(Jenkins.getInstance().getRootDir(),"jenkins.install.UpgradeWizard.state");
+    }
+
+    public UpgradeWizard() throws IOException {
+        updateUpToDate();
+    }
+
+    private void updateUpToDate() throws IOException {
+        upToDate = new VersionNumber("2.0").compareTo(getCurrentLevel()) <= 0;
+    }
+
+    /**
+     * What is the version the upgrade wizard has run the last time and upgraded to?
+     */
+    private VersionNumber getCurrentLevel() throws IOException {
+        VersionNumber from = new VersionNumber("1.0");
+        File state = getStateFile();
+        if (state.exists()) {
+            from = new VersionNumber(defaultIfBlank(readFileToString(state), "1.0").trim());
+        }
+        return from;
+    }
+
+    /*package*/
+    void setCurrentLevel(VersionNumber v) throws IOException {
+        FileUtils.writeStringToFile(getStateFile(), v.toString());
+        updateUpToDate();
+    }
+    
+    static void completeUpgrade(Jenkins jenkins) throws IOException {
+        // this was determined to be a new install, don't run the update wizard here
+        UpgradeWizard uw = jenkins.getInjector().getInstance(UpgradeWizard.class);
+        if (uw!=null)
+            uw.setCurrentLevel(new VersionNumber("2.0"));
+    }
+
+    /**
+     * Do we need to show the upgrade wizard prompt?
+     */
+    public boolean isDue() {
+        if (upToDate)
+            return false;
+
+        // only admin users should see this
+        if (!jenkins.hasPermission(Jenkins.ADMINISTER))
+            return false;
+
+        // only show when Jenkins is fully up & running
+        WebApp wa = WebApp.getCurrent();
+        if (wa==null || !(wa.getApp() instanceof Jenkins))
+            return false;
+
+        return System.currentTimeMillis() > getStateFile().lastModified();
+    }
+
+    /**
+     * Snooze the upgrade wizard notice.
+     */
+    @RequirePOST
+    public HttpResponse doSnooze() throws IOException {
+        jenkins.checkPermission(Jenkins.ADMINISTER);
+        File f = getStateFile();
+        FileUtils.touch(f);
+        f.setLastModified(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1));
+        LOGGER.log(FINE, "Snoozed the upgrade wizard notice");
+        return HttpResponses.redirectToContextRoot();
+    }
+
+    /**
+     * Performs the upgrade activity.
+     */
+    @RequirePOST
+    public HttpResponse doUpgrade() throws IOException {
+        jenkins.checkPermission(Jenkins.ADMINISTER);
+        try {
+            if (new VersionNumber("2.0").compareTo(getCurrentLevel())>0) {
+                // 1.0 -> 2.0 upgrade
+                LOGGER.log(WARNING, "Performing 1.0 to 2.0 upgrade");
+
+                for (String shortName : Arrays.asList("workflow-aggregator", "pipeline-stage-view", "github-organization-folder")) {
+                    Plugin p = jenkins.getUpdateCenter().getPlugin(shortName);
+                    if (p==null) {
+                        LOGGER.warning("Plugin not found in the update center: " + shortName);
+                    } else {
+                        p.deploy(true);
+                    }
+                }
+
+                // upgrade to 2.0 complete (if plugin installations fail, that's too bad)
+                FileUtils.writeStringToFile(getStateFile(),"2.0");
+
+                // send the user to the update center so that people can see the installation & restart if need be.
+                return HttpResponses.redirectViaContextPath("updateCenter/");
+            }
+
+//      in the future...
+//        if (new VersionNumber("3.0").compareTo(getCurrentLevel())>0) {
+//
+//        }
+
+            return NOOP;
+        } finally {
+            updateUpToDate();
+        }
+    }
+
+    /*package*/ static final HttpResponse NOOP = HttpResponses.redirectToContextRoot();
+
+
+    private static final Logger LOGGER = Logger.getLogger(UpgradeWizard.class.getName());
+}
diff --git a/core/src/main/java/jenkins/management/ConfigureLink.java b/core/src/main/java/jenkins/management/ConfigureLink.java
index bc7ab1bc16..b7e25ff7e0 100644
--- a/core/src/main/java/jenkins/management/ConfigureLink.java
+++ b/core/src/main/java/jenkins/management/ConfigureLink.java
@@ -35,7 +35,7 @@ public class ConfigureLink extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "setting.png";
+        return "gear2.png";
     }
 
     public String getDisplayName() {
diff --git a/core/src/main/java/jenkins/model/ArtifactManagerFactory.java b/core/src/main/java/jenkins/model/ArtifactManagerFactory.java
index f0d08c4e05..efff30c565 100644
--- a/core/src/main/java/jenkins/model/ArtifactManagerFactory.java
+++ b/core/src/main/java/jenkins/model/ArtifactManagerFactory.java
@@ -45,7 +45,7 @@ public abstract class ArtifactManagerFactory extends AbstractDescribableImpl<Art
      * All configured factories are consulted in sequence; the first manager thus yielded (if any) will be stored in the build.
      * {@link StandardArtifactManager} is used as a fallback.
      * @param build a running (or recently completed) build ready for {@link ArtifactManager#archive}
-     * @return a manager, or null if this manager should not handle this kind of project, builds on this kind of slave, etc.
+     * @return a manager, or null if this manager should not handle this kind of project, builds on this kind of agent, etc.
      */
     public abstract @CheckForNull ArtifactManager managerFor(Run<?,?> build);
 
diff --git a/core/src/main/java/jenkins/model/AssetManager.java b/core/src/main/java/jenkins/model/AssetManager.java
new file mode 100644
index 0000000000..d886ab70fd
--- /dev/null
+++ b/core/src/main/java/jenkins/model/AssetManager.java
@@ -0,0 +1,112 @@
+package jenkins.model;
+
+import hudson.Extension;
+import hudson.model.UnprotectedRootAction;
+import hudson.util.TimeUnit2;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.Enumeration;
+
+/**
+ * Serves files located in the {@code /assets} classpath directory via the Jenkins core ClassLoader.
+ * e.g. the URL {@code /assets/jquery-detached/jsmodules/jquery2.js} will load {@code jquery-detached/jsmodules/jquery2.js}
+ * resource from the classpath below {@code /assets}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@Extension
+public class AssetManager implements UnprotectedRootAction {
+
+    // not shown in the UI
+    @Override
+    public String getIconFileName() {
+        return null;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return null;
+    }
+
+    @Override
+    public String getUrlName() {
+        return "assets";
+    }
+
+    /**
+     * Exposes assets in the core classloader over HTTP.
+     */
+    public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        String path = req.getRestOfPath();
+        URL resource = findResource(path);
+
+        if (resource == null) {
+            rsp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+            return;
+        }
+
+        // Stapler routes requests like the "/static/.../foo/bar/zot" to be treated like "/foo/bar/zot"
+        // and this is used to serve long expiration header, by using Jenkins.VERSION_HASH as "..."
+        // to create unique URLs. Recognize that and set a long expiration header.
+        String requestPath = req.getRequestURI().substring(req.getContextPath().length());
+        boolean staticLink = requestPath.startsWith("/static/");
+        long expires = staticLink ? TimeUnit2.DAYS.toMillis(365) : -1;
+
+        // use serveLocalizedFile to support automatic locale selection
+        rsp.serveLocalizedFile(req, resource, expires);
+    }
+
+    /**
+     * Locates the asset from the classloader.
+     *
+     * <p>
+     * To allow plugins to bring its own assets without worrying about colliding with the assets in core,
+     * look for child classloader first. But to support plugins that get split, if the child classloader
+     * doesn't find it, fall back to the parent classloader.
+     */
+    private URL findResource(String path) throws IOException {
+        try {
+            if (path.contains("..")) // crude avoidance of directory traversal attack
+                throw new IllegalArgumentException(path);
+
+            String name;
+            if (path.charAt(0) == '/') {
+                name = "assets" + path;
+            } else {
+                name = "assets/" + path;
+            }
+
+            ClassLoader cl = Jenkins.class.getClassLoader();
+            URL url = (URL) $findResource.invoke(cl, name);
+            if (url==null) {
+                // pick the last one, which is the one closest to the leaf of the classloader tree.
+                Enumeration<URL> e = cl.getResources(name);
+                while (e.hasMoreElements()) {
+                    url = e.nextElement();
+                }
+            }
+            return url;
+        } catch (InvocationTargetException|IllegalAccessException e) {
+            throw new Error(e);
+        }
+    }
+
+    private static final Method $findResource = init();
+
+    private static Method init() {
+        try {
+            Method m = ClassLoader.class.getDeclaredMethod("findResource", String.class);
+            m.setAccessible(true);
+            return m;
+        } catch (NoSuchMethodException e) {
+            throw (Error)new NoSuchMethodError().initCause(e);
+        }
+    }
+}
diff --git a/core/src/main/java/jenkins/model/GlobalConfiguration.java b/core/src/main/java/jenkins/model/GlobalConfiguration.java
index 15cc69f831..31c8e08ff3 100644
--- a/core/src/main/java/jenkins/model/GlobalConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalConfiguration.java
@@ -42,15 +42,6 @@ public abstract class GlobalConfiguration extends Descriptor<GlobalConfiguration
         return this;
     }
 
-    /**
-     * Every {@link GlobalConfiguration} belongs to a specific category.
-     *
-     * @return never null, always the same value for a given instance of {@link GlobalConfiguration}.
-     */
-    public GlobalConfigurationCategory getCategory() {
-        return GlobalConfigurationCategory.get(GlobalConfigurationCategory.Unclassified.class);
-    }
-
     @Override
     public String getGlobalConfigPage() {
         return getConfigPage();
diff --git a/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java b/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java
index f78c1eb3f9..1c0f32a86c 100644
--- a/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java
+++ b/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java
@@ -4,8 +4,6 @@ import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.ModelObject;
-import hudson.security.*;
-import hudson.security.Messages;
 
 /**
  * Grouping of related {@link GlobalConfiguration}s.
@@ -73,11 +71,12 @@ public abstract class GlobalConfigurationCategory implements ExtensionPoint, Mod
     public static class Security extends GlobalConfigurationCategory {
         @Override
         public String getShortDescription() {
-            return Messages.GlobalSecurityConfiguration_Description();
+            return hudson.security.Messages.GlobalSecurityConfiguration_Description();
         }
 
         public String getDisplayName() {
             return hudson.security.Messages.GlobalSecurityConfiguration_DisplayName();
         }
     }
+
 }
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index a9957d8212..660a229135 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -196,6 +196,9 @@ import java.util.concurrent.CountDownLatch;
 import jenkins.ExtensionComponentSet;
 import jenkins.ExtensionRefreshException;
 import jenkins.InitReactorRunner;
+import jenkins.install.InstallState;
+import jenkins.install.InstallUtil;
+import jenkins.install.SetupWizard;
 import jenkins.model.ProjectNamingStrategy.DefaultProjectNamingStrategy;
 import jenkins.security.ConfidentialKey;
 import jenkins.security.ConfidentialStore;
@@ -336,6 +339,17 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     // this field needs to be at the very top so that other components can look at this value even during unmarshalling
     private String version = "1.0";
 
+    /**
+     * The Jenkins instance startup type i.e. NEW, UPGRADE etc
+     */
+    private transient InstallState installState = InstallState.UNKNOWN;
+    
+    /**
+     * If we're in the process of an initial setup, 
+     * this will be set
+     */
+    private transient SetupWizard setupWizard;
+
     /**
      * Number of executors of the master node.
      */
@@ -573,7 +587,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     private transient final CopyOnWriteList<SCMListener> scmListeners = new CopyOnWriteList<SCMListener>();
 
     /**
-     * TCP slave agent port.
+     * TCP agent port.
      * 0 for random, -1 to disable.
      */
     private int slaveAgentPort = Integer.getInteger(Jenkins.class.getName()+".slaveAgentPort",0);
@@ -603,7 +617,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     public transient final OverallLoadStatistics overallLoad = new OverallLoadStatistics();
 
     /**
-     * Load statistics of the free roaming jobs and slaves.
+     * Load statistics of the free roaming jobs and agents.
      *
      * This includes all executors on {@link hudson.model.Node.Mode#NORMAL} nodes and jobs that do not have any assigned nodes.
      *
@@ -623,7 +637,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      *      Use {@link #unlabeledNodeProvisioner}.
      *      This was broken because it was tracking all the executors in the system, but it was only tracking
      *      free-roaming jobs in the queue. So {@link Cloud} fails to launch nodes when you have some exclusive
-     *      slaves and free-roaming jobs in the queue.
+     *      agents and free-roaming jobs in the queue.
      */
     @Restricted(NoExternalUse.class)
     @Deprecated
@@ -786,7 +800,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         JenkinsJVMAccess._setJenkinsJVM(true); // set it for unit tests as they will not have gone through WebAppMain
         long start = System.currentTimeMillis();
 
-    	// As Jenkins is starting, grant this process full control
+        // As Jenkins is starting, grant this process full control
         ACL.impersonate(ACL.SYSTEM);
         try {
             this.root = root;
@@ -797,7 +811,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
             theInstance = this;
 
             if (!new File(root,"jobs").exists()) {
-                // if this is a fresh install, use more modern default layout that's consistent with slaves
+                // if this is a fresh install, use more modern default layout that's consistent with agents
                 workspaceDir = "${JENKINS_HOME}/workspace/${ITEM_FULLNAME}";
             }
 
@@ -856,6 +870,16 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
             if(KILL_AFTER_LOAD)
                 System.exit(0);
 
+            installState = InstallUtil.getInstallState();
+            if (installState == InstallState.RESTART || installState == InstallState.DOWNGRADE) {
+                InstallUtil.saveLastExecVersion();
+            }
+            
+            if(!installState.isSetupComplete()) {
+                // Start immediately with the setup wizard for new installs
+                setupWizard = new SetupWizard(this);
+            }
+
             launchTcpSlaveAgentListener();
 
             if (UDPBroadcastThread.PORT != -1) {
@@ -930,6 +954,33 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         }
         return this;
     }
+    
+    /**
+     * Get the Jenkins {@link jenkins.install.InstallState install state}.
+     * @return The Jenkins {@link jenkins.install.InstallState install state}.
+     */
+    @Nonnull
+    @Restricted(NoExternalUse.class)
+    public InstallState getInstallState() {
+        return installState;
+    }
+
+    /**
+     * Update the current install state.
+     */
+    @Restricted(NoExternalUse.class)
+    public void setInstallState(@Nonnull InstallState newState) {
+        installState = newState;
+    }
+
+    /**
+     * Get the URL path to the Install Wizard JavaScript.
+     * @return The URL path to the Install Wizard JavaScript.
+     */
+    @Restricted(NoExternalUse.class)
+    public String getInstallWizardPath() {
+        return servletContext.getInitParameter("install-wizard-path");
+    }
 
     /**
      * Executes a reactor.
@@ -1026,10 +1077,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
                         }
                     }
                 } catch (BindException e) {
-                    LOGGER.log(Level.WARNING, String.format("Failed to listen to incoming slave connections through JNLP port %s. Change the JNLP port number", slaveAgentPort), e);
+                    LOGGER.log(Level.WARNING, String.format("Failed to listen to incoming agent connections through JNLP port %s. Change the JNLP port number", slaveAgentPort), e);
                     new AdministrativeError(administrativeMonitorId,
-                            "Failed to listen to incoming slave connections through JNLP",
-                            "Failed to listen to incoming slave connections through JNLP. <a href='configureSecurity'>Change the JNLP port number</a> to solve the problem.", e);
+                            "Failed to listen to incoming agent connections through JNLP",
+                            "Failed to listen to incoming agent connections through JNLP. <a href='configureSecurity'>Change the JNLP port number</a> to solve the problem.", e);
                 }
             }
         }
@@ -1439,10 +1490,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      */
     @Exported(name="jobs")
     public List<TopLevelItem> getItems() {
-		if (authorizationStrategy instanceof AuthorizationStrategy.Unsecured ||
-			authorizationStrategy instanceof FullControlOnceLoggedInAuthorizationStrategy) {
-			return new ArrayList(items.values());
-		}
+        if (authorizationStrategy instanceof AuthorizationStrategy.Unsecured ||
+            authorizationStrategy instanceof FullControlOnceLoggedInAuthorizationStrategy) {
+            return new ArrayList(items.values());
+        }
 
         List<TopLevelItem> viewableItems = new ArrayList<TopLevelItem>();
         for (TopLevelItem item : items.values()) {
@@ -1749,7 +1800,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
 
 
     /**
-     * Gets the slave node of the give name, hooked under this Jenkins.
+     * Gets the agent node of the give name, hooked under this Jenkins.
      */
     public @CheckForNull Node getNode(String name) {
         return nodes.getNode(name);
@@ -1817,11 +1868,11 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     }
 
     public DescribableList<NodeProperty<?>, NodePropertyDescriptor> getNodeProperties() {
-    	return nodeProperties;
+        return nodeProperties;
     }
 
     public DescribableList<NodeProperty<?>, NodePropertyDescriptor> getGlobalNodeProperties() {
-    	return globalNodeProperties;
+        return globalNodeProperties;
     }
 
     /**
@@ -2430,7 +2481,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      */
     @Override public TopLevelItem getItem(String name) throws AccessDeniedException {
         if (name==null)    return null;
-    	TopLevelItem item = items.get(name);
+        TopLevelItem item = items.get(name);
         if (item==null)
             return null;
         if (!item.hasPermission(Item.READ)) {
@@ -2711,6 +2762,19 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         return new Hudson.MasterComputer();
     }
 
+    private void loadConfig() throws IOException {
+        XmlFile cfg = getConfigFile();
+        if (cfg.exists()) {
+            // reset some data that may not exist in the disk file
+            // so that we can take a proper compensation action later.
+            primaryView = null;
+            views.clear();
+
+            // load from disk
+            cfg.unmarshal(Jenkins.this);
+        }
+    }
+
     private synchronized TaskBuilder loadTasks() throws IOException {
         File projectsDir = new File(root,"jobs");
         if(!projectsDir.getCanonicalFile().isDirectory() && !projectsDir.mkdirs()) {
@@ -2725,17 +2789,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         TaskGraphBuilder g = new TaskGraphBuilder();
         Handle loadJenkins = g.requires(EXTENSIONS_AUGMENTED).attains(JOB_LOADED).add("Loading global config", new Executable() {
             public void run(Reactor session) throws Exception {
-                XmlFile cfg = getConfigFile();
-                if (cfg.exists()) {
-                    // reset some data that may not exist in the disk file
-                    // so that we can take a proper compensation action later.
-                    primaryView = null;
-                    views.clear();
-
-                    // load from disk
-                    cfg.unmarshal(Jenkins.this);
-                }
-
+                loadConfig();
                 // if we are loading old data that doesn't have this field
                 if (slaves != null && !slaves.isEmpty() && nodes.isLegacy()) {
                     nodes.setNodes(slaves);
@@ -2783,7 +2837,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
 
                 {// recompute label objects - populates the labels mapping.
                     for (Node slave : nodes.getNodes())
-                        // Note that not all labels are visible until the slaves have connected.
+                        // Note that not all labels are visible until the agents have connected.
                         slave.getAssignedLabels();
                     getAssignedLabels();
                 }
@@ -3305,8 +3359,6 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
 
             systemMessage = Util.nullify(req.getParameter("system_message"));
 
-            setJDKs(req.bindJSONToList(JDK.class, json.get("jdks")));
-
             boolean result = true;
             for (Descriptor<?> d : Functions.getSortedDescriptorsForGlobalConfigUnclassified())
                 result &= configureDescriptor(req,json,d);
@@ -3422,10 +3474,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     }
 
     public HttpResponse doToggleCollapse() throws ServletException, IOException {
-    	final StaplerRequest request = Stapler.getCurrentRequest();
-    	final String paneId = request.getParameter("paneId");
+        final StaplerRequest request = Stapler.getCurrentRequest();
+        final String paneId = request.getParameter("paneId");
 
-    	PaneStatusProperties.forCurrentUser().toggleCollapsed(paneId);
+        PaneStatusProperties.forCurrentUser().toggleCollapsed(paneId);
 
         return HttpResponses.forwardToPreviousPage();
     }
@@ -3438,10 +3490,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     }
 
     /**
-     * Obtains the thread dump of all slaves (including the master.)
+     * Obtains the thread dump of all agents (including the master.)
      *
      * <p>
-     * Since this is for diagnostics, it has a built-in precautionary measure against hang slaves.
+     * Since this is for diagnostics, it has a built-in precautionary measure against hang agents.
      */
     public Map<String,Map<String,String>> getAllThreadDumps() throws IOException, InterruptedException {
         checkPermission(ADMINISTER);
@@ -3456,9 +3508,9 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
                 LOGGER.info("Failed to get thread dump for node " + c.getName() + ": " + e.getMessage());
             }
         }
-		if (toComputer() == null) {
-			future.put("master", RemotingDiagnostics.getThreadDumpAsync(FilePath.localChannel));
-		}
+        if (toComputer() == null) {
+            future.put("master", RemotingDiagnostics.getThreadDumpAsync(FilePath.localChannel));
+        }
 
         // if the result isn't available in 5 sec, ignore that.
         // this is a precaution against hang nodes
@@ -3534,20 +3586,6 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         // looks good
     }
 
-    /**
-     * Makes sure that the given name is good as a job name.
-     * @return trimmed name if valid; throws Failure if not
-     */
-    private String checkJobName(String name) throws Failure {
-        checkGoodName(name);
-        name = name.trim();
-        projectNamingStrategy.checkName(name);
-        if(getItem(name)!=null)
-            throw new Failure(Messages.Hudson_JobAlreadyExists(name));
-        // looks good
-        return name;
-    }
-
     private static String toPrintableName(String name) {
         StringBuilder printableName = new StringBuilder();
         for( int i=0; i<name.length(); i++ ) {
@@ -3622,7 +3660,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     }
 
     /**
-     * Serves jar files for JNLP slave agents.
+     * Serves jar files for JNLP agents.
      */
     public Slave.JnlpJar getJnlpJars(String fileName) {
         return new Slave.JnlpJar(fileName);
@@ -4075,25 +4113,6 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
             return FormValidation.errorWithMarkup(Messages.Hudson_NoJavaInPath(request.getContextPath()));
     }
 
-    /**
-     * Makes sure that the given name is good as a job name.
-     */
-    public FormValidation doCheckJobName(@QueryParameter String value) {
-        // this method can be used to check if a file exists anywhere in the file system,
-        // so it should be protected.
-        checkPermission(Item.CREATE);
-
-        if(fixEmpty(value)==null)
-            return FormValidation.ok();
-
-        try {
-            checkJobName(value);
-            return FormValidation.ok();
-        } catch (Failure e) {
-            return FormValidation.error(e.getMessage());
-        }
-    }
-
     /**
      * Checks if a top-level view with the given name exists and
      * make sure that the name is good as a view name.
@@ -4234,6 +4253,20 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     public List<ManagementLink> getManagementLinks() {
         return ManagementLink.all();
     }
+    
+    /**
+     * If set, a currently active setup wizard - e.g. installation
+     */
+    public SetupWizard getSetupWizard() {
+        return setupWizard;
+    }
+    
+    /**
+     * Sets the setup wizard
+     */
+    public void setSetupWizard(SetupWizard setupWizard) {
+        this.setupWizard = setupWizard;
+    }
 
     /**
      * Exposes the current user to <tt>/me</tt> URL.
@@ -4544,14 +4577,14 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
             IOUtils.closeQuietly(is);
         }
         String ver = props.getProperty("version");
-        if(ver==null)   ver="?";
+        if(ver==null)   ver = UNCOMPUTED_VERSION;
         VERSION = ver;
         context.setAttribute("version",ver);
 
         VERSION_HASH = Util.getDigestOf(ver).substring(0, 8);
         SESSION_HASH = Util.getDigestOf(ver+System.currentTimeMillis()).substring(0, 8);
 
-        if(ver.equals("?") || Boolean.getBoolean("hudson.script.noCache"))
+        if(ver.equals(UNCOMPUTED_VERSION) || Boolean.getBoolean("hudson.script.noCache"))
             RESOURCE_PATH = "";
         else
             RESOURCE_PATH = "/static/"+SESSION_HASH;
@@ -4559,24 +4592,55 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         VIEW_RESOURCE_PATH = "/resources/"+ SESSION_HASH;
     }
 
+    /**
+     * The version number before it is "computed" (by a call to computeVersion()).
+     * @since FIXME
+     */
+    public static final String UNCOMPUTED_VERSION = "?";
+
     /**
      * Version number of this Jenkins.
      */
-    public static String VERSION="?";
+    public static String VERSION = UNCOMPUTED_VERSION;
 
     /**
      * Parses {@link #VERSION} into {@link VersionNumber}, or null if it's not parseable as a version number
      * (such as when Jenkins is run with "mvn hudson-dev:run")
      */
-    public static VersionNumber getVersion() {
+    public @CheckForNull static VersionNumber getVersion() {
+        return toVersion(VERSION);
+    }
+
+    /**
+     * Get the stored version of Jenkins, as stored by
+     * {@link #doConfigSubmit(org.kohsuke.stapler.StaplerRequest, org.kohsuke.stapler.StaplerResponse)}.
+     * <p>
+     * Parses the version into {@link VersionNumber}, or null if it's not parseable as a version number
+     * (such as when Jenkins is run with "mvn hudson-dev:run")
+     * @since FIXME
+     */
+    public @CheckForNull static VersionNumber getStoredVersion() {
+        return toVersion(Jenkins.getActiveInstance().version);
+    }
+
+    /**
+     * Parses a version string into {@link VersionNumber}, or null if it's not parseable as a version number
+     * (such as when Jenkins is run with "mvn hudson-dev:run")
+     */
+    private static @CheckForNull VersionNumber toVersion(@CheckForNull String versionString) {
+        if (versionString == null) {
+            return null;
+        }
+
         try {
-            return new VersionNumber(VERSION);
+            return new VersionNumber(versionString);
         } catch (NumberFormatException e) {
             try {
                 // for non-released version of Jenkins, this looks like "1.345 (private-foobar), so try to approximate.
-                int idx = VERSION.indexOf(' ');
-                if (idx>0)
-                    return new VersionNumber(VERSION.substring(0,idx));
+                int idx = versionString.indexOf(' ');
+                if (idx > 0) {
+                    return new VersionNumber(versionString.substring(0,idx));
+                }
             } catch (NumberFormatException _) {
                 // fall through
             }
@@ -4647,7 +4711,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     private static final String WORKSPACE_DIRNAME = Configuration.getStringConfigParameter("workspaceDirName", "workspace");
 
     /**
-     * Automatically try to launch a slave when Jenkins is initialized or a new slave is created.
+     * Automatically try to launch an agent when Jenkins is initialized or a new agent computer is created.
      */
     public static boolean AUTOMATIC_SLAVE_LAUNCH = true;
 
@@ -4706,7 +4770,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
             assert PERMISSIONS != null;
             assert ADMINISTER != null;
         } catch (RuntimeException e) {
-            // when loaded on a slave and this fails, subsequent NoClassDefFoundError will fail to chain the cause.
+            // when loaded on an agent and this fails, subsequent NoClassDefFoundError will fail to chain the cause.
             // see http://bugs.java.com/bugdatabase/view_bug.do?bug_id=8051847
             // As we don't know where the first exception will go, let's also send this to logging so that
             // we have a known place to look at.
diff --git a/core/src/main/java/jenkins/model/item_category/Categories.java b/core/src/main/java/jenkins/model/item_category/Categories.java
new file mode 100644
index 0000000000..9df7b230aa
--- /dev/null
+++ b/core/src/main/java/jenkins/model/item_category/Categories.java
@@ -0,0 +1,79 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model.item_category;
+
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.export.Exported;
+import org.kohsuke.stapler.export.ExportedBean;
+import org.kohsuke.stapler.export.Flavor;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import javax.servlet.ServletException;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * It is a logic representation of a set of {@link Category}.
+ *
+ * This class is not thread-safe.
+ */
+@ExportedBean
+@Restricted(NoExternalUse.class)
+public class Categories implements HttpResponse, Serializable {
+
+    private List<Category> items;
+
+    public Categories() {
+        items = new ArrayList<Category>();
+    }
+
+    @Exported(name = "categories")
+    public List<Category> getItems() {
+        return items;
+    }
+
+    @Override
+    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+        rsp.serveExposedBean(req, this, Flavor.JSON);
+    }
+
+    @CheckForNull
+    public Category getItem(@Nonnull String id) {
+        for (Category category : items) {
+            if (category.getId().equals(id)) {
+                return category;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/core/src/main/java/jenkins/model/item_category/Category.java b/core/src/main/java/jenkins/model/item_category/Category.java
new file mode 100644
index 0000000000..391d7ab8e3
--- /dev/null
+++ b/core/src/main/java/jenkins/model/item_category/Category.java
@@ -0,0 +1,97 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2016 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model.item_category;
+
+import hudson.model.TopLevelItem;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.export.Exported;
+import org.kohsuke.stapler.export.ExportedBean;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Represents an {@link ItemCategory} and its {@link TopLevelItem}s.
+ *
+ * This class is not thread-safe.
+ */
+@ExportedBean
+@Restricted(NoExternalUse.class)
+public class Category implements Serializable {
+
+    private String id;
+
+    private String name;
+
+    private String description;
+
+    private int order;
+
+    private int minToShow;
+
+    private List<Map<String, Serializable>> items;
+
+    public Category(String id, String name, String description, int order, int minToShow, List<Map<String, Serializable>> items) {
+        this.id= id;
+        this.name = name;
+        this.description = description;
+        this.order = order;
+        this.minToShow = minToShow;
+        this.items = items;
+    }
+
+    @Exported
+    public String getId() {
+        return id;
+    }
+
+    @Exported
+    public String getName() {
+        return name;
+    }
+
+    @Exported
+    public String getDescription() {
+        return description;
+    }
+
+    @Exported
+    public int getOrder() {
+        return order;
+    }
+
+    @Exported
+    public int getMinToShow() {
+        return minToShow;
+    }
+
+    @Exported
+    public List<Map<String, Serializable>> getItems() {
+        return items;
+    }
+
+}
diff --git a/core/src/main/java/jenkins/model/item_category/ItemCategory.java b/core/src/main/java/jenkins/model/item_category/ItemCategory.java
new file mode 100644
index 0000000000..7078a86377
--- /dev/null
+++ b/core/src/main/java/jenkins/model/item_category/ItemCategory.java
@@ -0,0 +1,133 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model.item_category;
+
+import hudson.Extension;
+import hudson.ExtensionList;
+import hudson.ExtensionPoint;
+import hudson.model.TopLevelItemDescriptor;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A category for {@link hudson.model.Item}s.
+ *
+ * @since 2.0
+ */
+public abstract class ItemCategory implements ExtensionPoint {
+
+    public static int MIN_TOSHOW = 1;
+
+    /**
+     * Helpful to set the order.
+     */
+    private int order = 1;
+
+    /**
+     * Identifier, e.g. "standaloneprojects", etc.
+     *
+     * @return the identifier
+     */
+    public abstract String getId();
+
+    /**
+     * The description in plain text
+     *
+     * @return the description
+     */
+    public abstract String getDescription();
+
+    /**
+     * A human readable name.
+     *
+     * @return the display name
+     */
+    public abstract String getDisplayName();
+
+    /**
+     * Minimum number of items required to show the category.
+     *
+     * @return the minimum items required
+     */
+    public abstract int getMinToShow();
+
+    private void setOrder(int order) {
+        this.order = order;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    /**
+     * A {@link ItemCategory} associated to this {@link TopLevelItemDescriptor}.
+     *
+     * @return A {@link ItemCategory}, if not found, {@link ItemCategory.UncategorizedCategory} is returned
+     */
+    @Nonnull
+    public static ItemCategory getCategory(TopLevelItemDescriptor descriptor) {
+        int order = 0;
+        ExtensionList<ItemCategory> categories = ExtensionList.lookup(ItemCategory.class);
+        for (ItemCategory category : categories) {
+            if (category.getId().equals(descriptor.getCategoryId())) {
+                category.setOrder(++order);
+                return category;
+            }
+            order++;
+        }
+        return new UncategorizedCategory();
+    }
+
+    /**
+     * The default {@link ItemCategory}, if an item doesn't belong anywhere else, this is where it goes by default.
+     */
+    @Extension(ordinal = Integer.MIN_VALUE)
+    public static final class UncategorizedCategory extends ItemCategory {
+
+        public static final String ID = "uncategorized";
+
+        @Override
+        public String getId() {
+            return ID;
+        }
+
+        @Override
+        public String getDescription() {
+            return Messages.Uncategorized_Description();
+        }
+
+        @Override
+        public String getDisplayName() {
+            return Messages.Uncategorized_DisplayName();
+        }
+
+        @Override
+        public int getMinToShow() {
+            return ItemCategory.MIN_TOSHOW;
+        }
+
+    }
+
+}
diff --git a/core/src/main/java/jenkins/model/item_category/NestedProjectsCategory.java b/core/src/main/java/jenkins/model/item_category/NestedProjectsCategory.java
new file mode 100644
index 0000000000..b4501d01e4
--- /dev/null
+++ b/core/src/main/java/jenkins/model/item_category/NestedProjectsCategory.java
@@ -0,0 +1,67 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model.item_category;
+
+import hudson.Extension;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
+
+/**
+ * Designed for project hierarchies with folders.
+ *
+ * This category should be moved to cloudbees-folder-plugin short-term.
+ * Really when upgrades its baseline to 2.0.
+ *
+ * @since 2.0
+ */
+@Restricted(DoNotUse.class)
+@Extension(ordinal = -100)
+public class NestedProjectsCategory extends ItemCategory {
+
+    /**
+     * TODO Make public when be moved to cloudbees-folder-plugin.
+     */
+    private static final String ID = "nested-projects";
+
+    @Override
+    public String getId() {
+        return ID;
+    }
+
+    @Override
+    public String getDescription() {
+        return Messages.NestedProjects_Description();
+    }
+
+    @Override
+    public String getDisplayName() {
+        return Messages.NestedProjects_DisplayName();
+    }
+
+    @Override
+    public int getMinToShow() {
+        return ItemCategory.MIN_TOSHOW;
+    }
+}
diff --git a/core/src/main/java/jenkins/model/item_category/StandaloneProjectsCategory.java b/core/src/main/java/jenkins/model/item_category/StandaloneProjectsCategory.java
new file mode 100644
index 0000000000..d1e5479bff
--- /dev/null
+++ b/core/src/main/java/jenkins/model/item_category/StandaloneProjectsCategory.java
@@ -0,0 +1,56 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model.item_category;
+
+import hudson.Extension;
+
+/**
+ * Designed for projects with a self-contained configuration and history.
+ */
+@Extension(ordinal = -100)
+public class StandaloneProjectsCategory extends ItemCategory {
+
+    public static final String ID = "standalone-projects";
+
+    @Override
+    public String getId() {
+        return ID;
+    }
+
+    @Override
+    public String getDescription() {
+        return Messages.StandaloneProjects_Description();
+    }
+
+    @Override
+    public String getDisplayName() {
+        return Messages.StandaloneProjects_DisplayName();
+    }
+
+    @Override
+    public int getMinToShow() {
+        return ItemCategory.MIN_TOSHOW;
+    }
+}
diff --git a/core/src/main/java/jenkins/mvn/GlobalMavenConfig.java b/core/src/main/java/jenkins/mvn/GlobalMavenConfig.java
index 67ace424e8..f1959125a2 100644
--- a/core/src/main/java/jenkins/mvn/GlobalMavenConfig.java
+++ b/core/src/main/java/jenkins/mvn/GlobalMavenConfig.java
@@ -2,6 +2,8 @@ package jenkins.mvn;
 
 import hudson.Extension;
 import jenkins.model.GlobalConfiguration;
+import jenkins.model.GlobalConfigurationCategory;
+import jenkins.tools.ToolConfigurationCategory;
 import net.sf.json.JSONObject;
 
 import org.kohsuke.stapler.StaplerRequest;
@@ -16,6 +18,11 @@ public class GlobalMavenConfig extends GlobalConfiguration {
         load();
     }
 
+    @Override
+    public ToolConfigurationCategory getCategory() {
+        return GlobalConfigurationCategory.get(ToolConfigurationCategory.class);
+    }
+
     @Override
     public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
         req.bindJSON(this, json);
diff --git a/core/src/main/java/jenkins/security/ChannelConfigurator.java b/core/src/main/java/jenkins/security/ChannelConfigurator.java
index a371ae5401..fd7c26e229 100644
--- a/core/src/main/java/jenkins/security/ChannelConfigurator.java
+++ b/core/src/main/java/jenkins/security/ChannelConfigurator.java
@@ -30,7 +30,7 @@ public abstract class ChannelConfigurator implements ExtensionPoint {
      *
      *      <dl>
      *          <dt>{@link SlaveComputer}
-     *          <dd>When a channel is being established to talk to a slave.
+     *          <dd>When a channel is being established to talk to a agent.
      *      </dl>
      */
     public void onChannelBuilding(ChannelBuilder builder, @Nullable Object context) {}
diff --git a/core/src/main/java/jenkins/security/MasterToSlaveCallable.java b/core/src/main/java/jenkins/security/MasterToSlaveCallable.java
index 29837e973a..e348ec1e49 100644
--- a/core/src/main/java/jenkins/security/MasterToSlaveCallable.java
+++ b/core/src/main/java/jenkins/security/MasterToSlaveCallable.java
@@ -5,7 +5,7 @@ import org.jenkinsci.remoting.RoleChecker;
 
 
 /**
- * Convenient {@link Callable} meant to be run on slave.
+ * Convenient {@link Callable} meant to be run on agent.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.THU
diff --git a/core/src/main/java/jenkins/security/Roles.java b/core/src/main/java/jenkins/security/Roles.java
index cca26873a5..ada2ca96c0 100644
--- a/core/src/main/java/jenkins/security/Roles.java
+++ b/core/src/main/java/jenkins/security/Roles.java
@@ -7,7 +7,7 @@ import org.jenkinsci.remoting.Role;
  *
  * <p>
  * In Jenkins, there is really only one interesting role, which is the Jenkins master.
- * Slaves, CLI, and Maven processes are all going to load classes from the master,
+ * Agents, CLI, and Maven processes are all going to load classes from the master,
  * which means it accepts anything that the master asks for, and thus they need
  * not have any role.
  *
@@ -16,14 +16,14 @@ import org.jenkinsci.remoting.Role;
  */
 public class Roles {
     /**
-     * Indicates that a callable runs on masters, requested by slaves/CLI/maven/whatever.
+     * Indicates that a callable runs on masters, requested by agents/CLI/maven/whatever.
      */
     public static final Role MASTER = new Role("master");
 
     /**
-     * Indicates that a callable is meant to run on slaves.
+     * Indicates that a callable is meant to run on agents.
      *
-     * This isn't used to reject callables to run on the slave, but rather to allow
+     * This isn't used to reject callables to run on the agent, but rather to allow
      * the master to promptly reject callables that are really not meant to be run on
      * the master (as opposed to ones that do not have that information, which gets
      * {@link Role#UNKNOWN})
diff --git a/core/src/main/java/jenkins/security/SlaveToMasterCallable.java b/core/src/main/java/jenkins/security/SlaveToMasterCallable.java
index 2a3a35a42b..34b227c5bf 100644
--- a/core/src/main/java/jenkins/security/SlaveToMasterCallable.java
+++ b/core/src/main/java/jenkins/security/SlaveToMasterCallable.java
@@ -5,7 +5,7 @@ import org.jenkinsci.remoting.RoleChecker;
 
 
 /**
- * Convenient {@link Callable} that are meant to run on the master (sent by slave/CLI/etc).
+ * Convenient {@link Callable} that are meant to run on the master (sent by agent/CLI/etc).
  *
  * @author Kohsuke Kawaguchi
  * @since 1.THU
diff --git a/core/src/main/java/jenkins/security/s2m/AdminCallableMonitor.java b/core/src/main/java/jenkins/security/s2m/AdminCallableMonitor.java
index d6a483af76..c93a8d0055 100644
--- a/core/src/main/java/jenkins/security/s2m/AdminCallableMonitor.java
+++ b/core/src/main/java/jenkins/security/s2m/AdminCallableMonitor.java
@@ -38,7 +38,7 @@ public class AdminCallableMonitor extends AdministrativeMonitor {
 
     @Override
     public String getDisplayName() {
-        return "Slave \u2192 Master Access Control";
+        return "Agent \u2192 Master Access Control";
     }
 
     // bind this to URL
diff --git a/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java b/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java
index 706d17c0be..9042f19c3c 100644
--- a/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java
+++ b/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java
@@ -55,11 +55,11 @@ public class CallableDirectionChecker extends RoleChecker {
 
         if (isWhitelisted(subject,expected)) {
             // this subject is dubious, but we are letting it through as per whitelisting
-            LOGGER.log(Level.FINE, "Explicitly allowing {0} to be sent from slave to master", name);
+            LOGGER.log(Level.FINE, "Explicitly allowing {0} to be sent from agent to master", name);
             return;
         }
 
-        throw new SecurityException("Sending " + name + " from slave to master is prohibited.\nSee http://jenkins-ci.org/security-144 for more details");
+        throw new SecurityException("Sending " + name + " from agent to master is prohibited.\nSee http://jenkins-ci.org/security-144 for more details");
     }
 
     /**
diff --git a/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java b/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java
index 563d19269e..1cc0944737 100644
--- a/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java
+++ b/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java
@@ -36,7 +36,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * Blocks slaves from writing to files on the master by default (and also provide the kill switch.)
+ * Blocks agents from writing to files on the master by default (and also provide the kill switch.)
  */
 @Restricted(DoNotUse.class) // impl
 @Extension public class DefaultFilePathFilter extends ChannelConfigurator {
@@ -53,7 +53,7 @@ import java.util.logging.Logger;
         new ReflectiveFilePathFilter() {
             protected boolean op(String op, File f) throws SecurityException {
                 if (BYPASS) {
-                    LOGGER.log(Level.FINE, "slave allowed to {0} {1}", new Object[] {op, f});
+                    LOGGER.log(Level.FINE, "agent allowed to {0} {1}", new Object[] {op, f});
                     return true;
                 } else {
                     return false;
diff --git a/core/src/main/java/jenkins/security/s2m/package-info.java b/core/src/main/java/jenkins/security/s2m/package-info.java
index 84875777f6..b0650138bc 100644
--- a/core/src/main/java/jenkins/security/s2m/package-info.java
+++ b/core/src/main/java/jenkins/security/s2m/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Slave -> master security.
+ * Agent -> master security.
  */
 package jenkins.security.s2m;
diff --git a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
index 3de0ab274a..f82ad9ca18 100644
--- a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
+++ b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
@@ -19,7 +19,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * Match the name against the slave name and route the incoming JNLP agent as {@link Slave}.
+ * Match the name against the agent name and route the incoming JNLP agent as {@link Slave}.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.561  
@@ -54,7 +54,7 @@ public class DefaultJnlpSlaveReceiver extends JnlpAgentReceiver {
         }
 
         if (!matchesSecret(nodeName,handshake)) {
-            handshake.error(nodeName + " can't be connected since the slave's secret does not match the handshake secret.");
+            handshake.error(nodeName + " can't be connected since the agent's secret does not match the handshake secret.");
             return true;
         }
 
@@ -74,7 +74,7 @@ public class DefaultJnlpSlaveReceiver extends JnlpAgentReceiver {
     }
     
     /**
-     * Called after the client has connected to check if the slave secret matches the handshake secret
+     * Called after the client has connected to check if the agent secret matches the handshake secret
      *
      * @param nodeName
      * Name of the incoming JNLP agent. All {@link JnlpAgentReceiver} shares a single namespace
@@ -84,12 +84,12 @@ public class DefaultJnlpSlaveReceiver extends JnlpAgentReceiver {
      * Encapsulation of the interaction with the incoming JNLP agent.
      *
      * @return
-     * true if the slave secret matches the handshake secret, false otherwise.
+     * true if the agent secret matches the handshake secret, false otherwise.
      */
     private boolean matchesSecret(String nodeName, JnlpServerHandshake handshake){
         SlaveComputer computer = (SlaveComputer) Jenkins.getInstance().getComputer(nodeName);
         String handshakeSecret = handshake.getRequestProperty("Secret-Key");
-        // Verify that the slave secret matches the handshake secret.
+        // Verify that the agent secret matches the handshake secret.
         if (!computer.getJnlpMac().equals(handshakeSecret)) {
             LOGGER.log(Level.WARNING, "An attempt was made to connect as {0} from {1} with an incorrect secret", new Object[]{nodeName, handshake.getSocket()!=null?handshake.getSocket().getRemoteSocketAddress():null});
             return false;
diff --git a/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java b/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java
index dfdd5de750..feb11427a8 100644
--- a/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java
+++ b/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java
@@ -44,7 +44,7 @@ public class EncryptedSlaveAgentJnlpFile implements HttpResponse {
      */
     private final String viewName;
     /**
-     * Name of the slave, which is used to determine secret HMAC code.
+     * Name of the agent, which is used to determine secret HMAC code.
      */
     private final String slaveName;
     /**
diff --git a/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java b/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java
index 3a382fd6c4..7865c88526 100644
--- a/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java
+++ b/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java
@@ -10,7 +10,7 @@ import java.io.IOException;
 import java.util.Properties;
 
 /**
- * Receives incoming slaves connecting through {@link JnlpSlaveAgentProtocol2}.
+ * Receives incoming agents connecting through {@link JnlpSlaveAgentProtocol2}.
  *
  * <p>
  * This is useful to establish the communication with other JVMs and use them
diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
index 6dc34ffd10..6ba274c8aa 100644
--- a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
+++ b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
@@ -27,26 +27,26 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * {@link AgentProtocol} that accepts connection from slave agents.
+ * {@link AgentProtocol} that accepts connection from agents.
  *
  * <h2>Security</h2>
  * <p>
- * Once connected, remote slave agents can send in commands to be
+ * Once connected, remote agents can send in commands to be
  * executed on the master, so in a way this is like an rsh service.
  * Therefore, it is important that we reject connections from
- * unauthorized remote slaves.
+ * unauthorized remote agents.
  *
  * <p>
- * We do this by computing HMAC of the slave name.
- * This code is sent to the slave inside the <tt>.jnlp</tt> file
+ * We do this by computing HMAC of the agent name.
+ * This code is sent to the agent inside the <tt>.jnlp</tt> file
  * (this file itself is protected by HTTP form-based authentication that
- * we use everywhere else in Jenkins), and the slave sends this
+ * we use everywhere else in Jenkins), and the agent sends this
  * token back when it connects to the master.
- * Unauthorized slaves can't access the protected <tt>.jnlp</tt> file,
- * so it can't impersonate a valid slave.
+ * Unauthorized agents can't access the protected <tt>.jnlp</tt> file,
+ * so it can't impersonate a valid agent.
  *
  * <p>
- * We don't want to force the JNLP slave agents to be restarted
+ * We don't want to force the JNLP agents to be restarted
  * whenever the server restarts, so right now this secret master key
  * is generated once and used forever, which makes this whole scheme
  * less secure.
@@ -96,7 +96,7 @@ public class JnlpSlaveAgentProtocol extends AgentProtocol {
 
             SlaveComputer computer = (SlaveComputer) Jenkins.getInstance().getComputer(nodeName);
             if(computer==null) {
-                error("No such slave: "+nodeName);
+                error("No such agent: "+nodeName);
                 return;
             }
 
@@ -139,10 +139,10 @@ public class JnlpSlaveAgentProtocol extends AgentProtocol {
                 return computer.getChannel();
             } catch (AbortException e) {
                 logw.println(e.getMessage());
-                logw.println("Failed to establish the connection with the slave");
+                logw.println("Failed to establish the connection with the agent");
                 throw e;
             } catch (IOException e) {
-                logw.println("Failed to establish the connection with the slave " + nodeName);
+                logw.println("Failed to establish the connection with the agent " + nodeName);
                 e.printStackTrace(logw);
                 throw e;
             }
@@ -152,7 +152,7 @@ public class JnlpSlaveAgentProtocol extends AgentProtocol {
     private static final Logger LOGGER = Logger.getLogger(JnlpSlaveAgentProtocol.class.getName());
 
     /**
-     * This secret value is used as a seed for slaves.
+     * This secret value is used as a seed for agents.
      */
     public static final HMACConfidentialKey SLAVE_SECRET = new HMACConfidentialKey(JnlpSlaveAgentProtocol.class,"secret");
 }
diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
index 2b7e4e719e..23baaf31b6 100644
--- a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
+++ b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
@@ -13,7 +13,7 @@ import java.net.Socket;
  *
  * <p>
  * This protocol extends the version 1 protocol by adding a per-client cookie,
- * so that we can detect a reconnection from the slave and take appropriate action,
+ * so that we can detect a reconnection from the agent and take appropriate action,
  * when the connection disappeared without the master noticing.
  *
  * @author Kohsuke Kawaguchi
@@ -46,7 +46,7 @@ public class JnlpSlaveAgentProtocol2 extends JnlpSlaveAgentProtocol {
         }
 
         /**
-         * Handles JNLP slave agent connection request (v2 protocol)
+         * Handles JNLP agent connection request (v2 protocol)
          */
         @Override
         protected void run() throws IOException, InterruptedException {
diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java b/core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java
index 4c9dcfa873..1b67b98ecf 100644
--- a/core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java
+++ b/core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java
@@ -8,7 +8,7 @@ import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 
 /**
- * Palette of objects to talk to the incoming JNLP slave connection.
+ * Palette of objects to talk to the incoming JNLP agent connection.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.561
diff --git a/core/src/main/java/jenkins/slaves/WorkspaceLocator.java b/core/src/main/java/jenkins/slaves/WorkspaceLocator.java
index 7c7cb38258..7a99dce1c5 100644
--- a/core/src/main/java/jenkins/slaves/WorkspaceLocator.java
+++ b/core/src/main/java/jenkins/slaves/WorkspaceLocator.java
@@ -8,7 +8,7 @@ import hudson.model.TopLevelItem;
 
 /**
  * Allow extensions to override workspace locations
- * on given slaves or projects.
+ * on given agents or projects.
  * 
  * @author ryan.campbell@gmail.com
  * @since 1.501
@@ -17,11 +17,11 @@ public abstract class WorkspaceLocator implements ExtensionPoint {
     
     /**
      * Allows extensions to customize the workspace path. The first non-null response
-     * will determine the path to the workspace on that slave.
+     * will determine the path to the workspace on that agent.
      * 
      * @param item The toplevel item
-     * @param node The slave node
-     * @return The absolute FilePath to the workspace on the slave. 
+     * @param node The agent node
+     * @return The absolute FilePath to the workspace on the agent. 
      * Will be created if it doesn't exist.
      * 
      */
diff --git a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java
index 61e21c4b18..d30d6d2281 100644
--- a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java
+++ b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java
@@ -21,11 +21,11 @@ import static java.util.logging.Level.*;
 import jenkins.security.MasterToSlaveCallable;
 
 /**
- * Actual slave restart logic.
+ * Actual agent restart logic.
  *
  * <p>
  * Use {@link ComputerListener} to install {@link EngineListener}, which in turn gets executed when
- * the slave gets disconnected.
+ * the agent gets disconnected.
  *
  * @author Kohsuke Kawaguchi
  */
@@ -73,15 +73,15 @@ public class JnlpSlaveRestarterInstaller extends ComputerListener implements Ser
                             try {
                                 for (SlaveRestarter r : restarters) {
                                     try {
-                                        LOGGER.info("Restarting slave via "+r);
+                                        LOGGER.info("Restarting agent via "+r);
                                         r.restart();
                                     } catch (Exception x) {
-                                        LOGGER.log(SEVERE, "Failed to restart slave with "+r, x);
+                                        LOGGER.log(SEVERE, "Failed to restart agent with "+r, x);
                                     }
                                 }
                             } finally {
                                 // if we move on to the reconnection without restart,
-                                // don't let the current implementations kick in when the slave loses connection again
+                                // don't let the current implementations kick in when the agent loses connection again
                                 restarters.clear();
                             }
                         }
diff --git a/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java b/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java
index 84e88202c9..3484774e8e 100644
--- a/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java
+++ b/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java
@@ -7,22 +7,22 @@ import java.io.Serializable;
 import java.util.logging.Logger;
 
 /**
- * Extension point to control how to restart JNLP slave when it loses the connection with the master.
+ * Extension point to control how to restart JNLP agent when it loses the connection with the master.
  *
  * <p>
- * Objects are instantiated on the master, then transferred to a slave via serialization.
+ * Objects are instantiated on the master, then transferred to an agent via serialization.
  *
  * @author Kohsuke Kawaguchi
  */
 public abstract class SlaveRestarter implements ExtensionPoint, Serializable {
     /**
-     * Called on the slave to see if this restarter can work on this slave.
+     * Called on the agent to see if this restarter can work on this agent.
      */
     public abstract boolean canWork();
 
     /**
      * If {@link #canWork()} method returns true, this method is called later when
-     * the connection is lost to restart the slave.
+     * the connection is lost to restart the agent.
      *
      * <p>
      * Note that by the time this method is called, classloader is no longer capable of
@@ -32,8 +32,8 @@ public abstract class SlaveRestarter implements ExtensionPoint, Serializable {
      *
      * <p>
      * This method is not expected to return, and the JVM should terminate before this call returns.
-     * If the method returns normally, the JNLP slave will move on to the reconnection without restart.
-     * If an exception is thrown, it is reported as an error and then the JNLP slave will move on to the
+     * If the method returns normally, the JNLP agent will move on to the reconnection without restart.
+     * If an exception is thrown, it is reported as an error and then the JNLP agent will move on to the
      * reconnection without restart.
      */
     public abstract void restart() throws Exception;
diff --git a/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java b/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java
new file mode 100644
index 0000000000..209c4a1b72
--- /dev/null
+++ b/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java
@@ -0,0 +1,109 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins.tools;
+
+import com.google.common.base.Predicate;
+import hudson.Extension;
+import hudson.Functions;
+import hudson.model.Descriptor;
+import hudson.model.ManagementLink;
+import hudson.security.Permission;
+import hudson.util.FormApply;
+import jenkins.model.GlobalConfigurationCategory;
+import jenkins.model.Jenkins;
+import net.sf.json.JSONObject;
+
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
+
+import javax.servlet.ServletException;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@Extension(ordinal = Integer.MAX_VALUE - 220)
+@Restricted(NoExternalUse.class)
+public class GlobalToolConfiguration extends ManagementLink {
+
+    @Override
+    public String getIconFileName() {
+        return "setting.png";
+    }
+
+    @Override
+    public String getDisplayName() {
+        return jenkins.management.Messages.ConfigureTools_DisplayName();
+    }
+
+    @Override
+    public String getDescription() {
+        return jenkins.management.Messages.ConfigureTools_Description();
+    }
+
+    @Override
+    public String getUrlName() {
+        return "configureTools";
+    }
+
+    @Override
+    public Permission getRequiredPermission() {
+        return Jenkins.ADMINISTER;
+    }
+
+    public synchronized void doConfigure(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+        boolean result = configure(req, req.getSubmittedForm());
+        LOGGER.log(Level.FINE, "tools saved: "+result);
+        FormApply.success(req.getContextPath() + "/manage").generateResponse(req, rsp, null);
+    }
+
+    private boolean configure(StaplerRequest req, JSONObject json) throws hudson.model.Descriptor.FormException, IOException {
+        Jenkins j = Jenkins.getInstance();
+        j.checkPermission(Jenkins.ADMINISTER);
+
+        boolean result = true;
+        for(Descriptor<?> d : Functions.getSortedDescriptorsForGlobalConfig(FILTER)){
+            result &= configureDescriptor(req, json, d);
+        }
+        j.save();
+
+        return result;
+    }
+
+    private boolean configureDescriptor(StaplerRequest req, JSONObject json, Descriptor<?> d) throws Descriptor.FormException {
+        String name = d.getJsonSafeClassName();
+        JSONObject js = json.has(name) ? json.getJSONObject(name) : new JSONObject(); // if it doesn't have the property, the method returns invalid null object.
+        json.putAll(js);
+        return d.configure(req, js);
+    }
+
+    public static Predicate<GlobalConfigurationCategory> FILTER = new Predicate<GlobalConfigurationCategory>() {
+        public boolean apply(GlobalConfigurationCategory input) {
+            return input instanceof ToolConfigurationCategory;
+        }
+    };
+
+    private static final Logger LOGGER = Logger.getLogger(GlobalToolConfiguration.class.getName());
+}
diff --git a/core/src/main/java/jenkins/tools/ToolConfigurationCategory.java b/core/src/main/java/jenkins/tools/ToolConfigurationCategory.java
new file mode 100644
index 0000000000..e785369556
--- /dev/null
+++ b/core/src/main/java/jenkins/tools/ToolConfigurationCategory.java
@@ -0,0 +1,21 @@
+package jenkins.tools;
+
+import hudson.Extension;
+import jenkins.model.GlobalConfigurationCategory;
+
+/**
+ * Global configuration of tool locations and installers.
+ *
+ * @since 2.0
+ */
+@Extension
+public class ToolConfigurationCategory extends GlobalConfigurationCategory {
+    @Override
+    public String getShortDescription() {
+        return jenkins.management.Messages.ConfigureTools_Description();
+    }
+
+    public String getDisplayName() {
+        return jenkins.management.Messages.ConfigureTools_DisplayName();
+    }
+}
diff --git a/core/src/main/java/jenkins/util/ResourceBundleUtil.java b/core/src/main/java/jenkins/util/ResourceBundleUtil.java
new file mode 100644
index 0000000000..1649c6c77c
--- /dev/null
+++ b/core/src/main/java/jenkins/util/ResourceBundleUtil.java
@@ -0,0 +1,91 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins.util;
+
+import net.sf.json.JSONObject;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+import javax.annotation.Nonnull;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Simple {@link java.util.ResourceBundle} utility class.
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ * @since FIXME
+ */
+public class ResourceBundleUtil {
+
+    private static final Map<String, JSONObject> bundles = new ConcurrentHashMap<>();
+
+    private ResourceBundleUtil() {
+    }
+
+    /**
+     * Get a bundle JSON using the default Locale.
+     * @param baseName The bundle base name.
+     * @return The bundle JSON.
+     * @throws MissingResourceException Missing resource bundle.
+     */
+    @Restricted(NoExternalUse.class)
+    public static @Nonnull JSONObject getBundle(@Nonnull String baseName) throws MissingResourceException {
+        return getBundle(baseName, Locale.getDefault());
+    }
+
+    /**
+     * Get a bundle JSON using the supplied Locale.
+     * @param baseName The bundle base name.
+     * @param locale The Locale.
+     * @return The bundle JSON.
+     * @throws MissingResourceException Missing resource bundle.
+     */
+    @Restricted(NoExternalUse.class)
+    public static @Nonnull JSONObject getBundle(@Nonnull String baseName, @Nonnull Locale locale) throws MissingResourceException {
+        String bundleKey = baseName + ":" + locale.toString();
+        JSONObject bundleJSON = bundles.get(bundleKey);
+
+        if (bundleJSON != null) {
+            return bundleJSON;
+        }
+
+        ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale);
+
+        bundleJSON = toJSONObject(bundle);
+        bundles.put(bundleKey, bundleJSON);
+
+        return bundleJSON;
+    }
+
+    private static JSONObject toJSONObject(@Nonnull ResourceBundle bundle) {
+        JSONObject json = new JSONObject();
+        for (String key : bundle.keySet()) {
+            json.put(key, bundle.getString(key));
+        }
+        return json;
+    }
+}
diff --git a/core/src/main/java/jenkins/util/io/OnMaster.java b/core/src/main/java/jenkins/util/io/OnMaster.java
index ce84873df8..dccd02d6ce 100644
--- a/core/src/main/java/jenkins/util/io/OnMaster.java
+++ b/core/src/main/java/jenkins/util/io/OnMaster.java
@@ -2,12 +2,12 @@ package jenkins.util.io;
 
 /**
  * Marks the objects in Jenkins that only exist in the core
- * and not on slaves.
+ * and not on agents.
  *
  * <p>
  * This marker interface is for plugin developers to quickly
  * tell if they can take a specific object from a master to
- * a slave.
+ * an agent.
  *
  * (Core developers, if you find classes/interfaces that extend
  * from this, please be encouraged to add them.)
diff --git a/core/src/main/java/jenkins/util/xml/XMLUtils.java b/core/src/main/java/jenkins/util/xml/XMLUtils.java
index 84e6f6151b..bf96669052 100644
--- a/core/src/main/java/jenkins/util/xml/XMLUtils.java
+++ b/core/src/main/java/jenkins/util/xml/XMLUtils.java
@@ -1,17 +1,28 @@
 package jenkins.util.xml;
 
+import org.apache.commons.io.IOUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -19,6 +30,9 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
 /**
  * Utilities useful when working with various XML types.
@@ -29,6 +43,9 @@ public final class XMLUtils {
     private final static Logger LOGGER = LogManager.getLogManager().getLogger(XMLUtils.class.getName());
     private final static String DISABLED_PROPERTY_NAME = XMLUtils.class.getName() + ".disableXXEPrevention";
 
+    private static final String FEATURE_HTTP_XML_ORG_SAX_FEATURES_EXTERNAL_GENERAL_ENTITIES = "http://xml.org/sax/features/external-general-entities";
+    private static final String FEATURE_HTTP_XML_ORG_SAX_FEATURES_EXTERNAL_PARAMETER_ENTITIES = "http://xml.org/sax/features/external-parameter-entities";
+
     /**
      * Transform the source to the output in a manner that is protected against XXE attacks.
      * If the transform can not be completed safely then an IOException is thrown.
@@ -47,11 +64,11 @@ public final class XMLUtils {
 
             XMLReader xmlReader = XMLReaderFactory.createXMLReader();
             try {
-                xmlReader.setFeature("http://xml.org/sax/features/external-general-entities", false);
+                xmlReader.setFeature(FEATURE_HTTP_XML_ORG_SAX_FEATURES_EXTERNAL_GENERAL_ENTITIES, false);
             }
             catch (SAXException ignored) { /* ignored */ }
             try {
-                xmlReader.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+                xmlReader.setFeature(FEATURE_HTTP_XML_ORG_SAX_FEATURES_EXTERNAL_PARAMETER_ENTITIES, false);
             }
             catch (SAXException ignored) { /* ignored */ }
             // defend against XXE
@@ -81,6 +98,106 @@ public final class XMLUtils {
         }
     }
 
+    /**
+     * Parse the supplied XML stream data to a {@link Document}.
+     * <p>
+     * This function does not close the stream.
+     *
+     * @param stream The XML stream.
+     * @return The XML {@link Document}.
+     * @throws SAXException Error parsing the XML stream data e.g. badly formed XML.
+     * @throws IOException Error reading from the steam.
+     * @since FIXME
+     */
+    public static @Nonnull Document parse(@Nonnull Reader stream) throws SAXException, IOException {
+        DocumentBuilder docBuilder;
+
+        try {
+            docBuilder = newDocumentBuilderFactory().newDocumentBuilder();
+            docBuilder.setEntityResolver(RestrictiveEntityResolver.INSTANCE);
+        } catch (ParserConfigurationException e) {
+            throw new IllegalStateException("Unexpected error creating DocumentBuilder.", e);
+        }
+
+        return docBuilder.parse(new InputSource(stream));
+    }
+
+    /**
+     * Parse the supplied XML file data to a {@link Document}.
+     * @param file The file to parse.
+     * @param encoding The encoding of the XML in the file.
+     * @return The parsed document.
+     * @throws SAXException Error parsing the XML file data e.g. badly formed XML.
+     * @throws IOException Error reading from the file.
+     * @since FIXME
+     */
+    public static @Nonnull Document parse(@Nonnull File file, @Nonnull String encoding) throws SAXException, IOException {
+        if (!file.exists() || !file.isFile()) {
+            throw new IllegalArgumentException(String.format("File %s does not exist or is not a 'normal' file.", file.getAbsolutePath()));
+        }
+
+        FileInputStream fileInputStream = new FileInputStream(file);
+        try {
+            InputStreamReader fileReader = new InputStreamReader(fileInputStream, encoding);
+            try {
+                return parse(fileReader);
+            } finally {
+                IOUtils.closeQuietly(fileReader);
+            }
+        } finally {
+            IOUtils.closeQuietly(fileInputStream);
+        }
+    }
+
+    /**
+     * The a "value" from an XML file using XPath.
+     * <p>
+     * Uses the system encoding for reading the file.
+     *
+     * @param xpath The XPath expression to select the value.
+     * @param file The file to read.
+     * @return The data value. An empty {@link String} is returned when the expression does not evaluate
+     * to anything in the document.
+     * @throws IOException Error reading from the file.
+     * @throws SAXException Error parsing the XML file data e.g. badly formed XML.
+     * @throws XPathExpressionException Invalid XPath expression.
+     * @since FIXME
+     */
+    public static @Nonnull String getValue(@Nonnull String xpath, @Nonnull File file) throws IOException, SAXException, XPathExpressionException {
+        return getValue(xpath, file, Charset.defaultCharset().toString());
+    }
+
+    /**
+     * The a "value" from an XML file using XPath.
+     * @param xpath The XPath expression to select the value.
+     * @param file The file to read.
+     * @param fileDataEncoding The file data format.
+     * @return The data value. An empty {@link String} is returned when the expression does not evaluate
+     * to anything in the document.
+     * @throws IOException Error reading from the file.
+     * @throws SAXException Error parsing the XML file data e.g. badly formed XML.
+     * @throws XPathExpressionException Invalid XPath expression.
+     * @since FIXME
+     */
+    public static @Nonnull String getValue(@Nonnull String xpath, @Nonnull File file, @Nonnull String fileDataEncoding) throws IOException, SAXException, XPathExpressionException {
+        Document document = parse(file, fileDataEncoding);
+        return getValue(xpath, document);
+    }
+
+    /**
+     * The a "value" from an XML file using XPath.
+     * @param xpath The XPath expression to select the value.
+     * @param document The document from which the value is to be extracted.
+     * @return The data value. An empty {@link String} is returned when the expression does not evaluate
+     * to anything in the document.
+     * @throws XPathExpressionException Invalid XPath expression.
+     * @since FIXME
+     */
+    public static String getValue(String xpath, Document document) throws XPathExpressionException {
+        XPath xPathProcessor = XPathFactory.newInstance().newXPath();
+        return xPathProcessor.compile(xpath).evaluate(document);
+    }
+
     /**
      * potentially unsafe XML transformation.
      * @param source The XML input to transform.
@@ -96,4 +213,25 @@ public final class XMLUtils {
         t.transform(source, out);
     }
 
+    private static DocumentBuilderFactory newDocumentBuilderFactory() {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        // Set parser features to prevent against XXE etc.
+        // Note: setting only the external entity features on DocumentBuilderFactory instance
+        // (ala how safeTransform does it for SAXTransformerFactory) does seem to work (was still
+        // processing the entities - tried Oracle JDK 7 and 8 on OSX). Setting seems a bit extreme,
+        // but looks like there's no other choice.
+        documentBuilderFactory.setXIncludeAware(false);
+        documentBuilderFactory.setExpandEntityReferences(false);
+        setDocumentBuilderFactoryFeature(documentBuilderFactory, XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        setDocumentBuilderFactoryFeature(documentBuilderFactory, FEATURE_HTTP_XML_ORG_SAX_FEATURES_EXTERNAL_GENERAL_ENTITIES, false);
+        setDocumentBuilderFactoryFeature(documentBuilderFactory, FEATURE_HTTP_XML_ORG_SAX_FEATURES_EXTERNAL_PARAMETER_ENTITIES, false);
+        setDocumentBuilderFactoryFeature(documentBuilderFactory, "http://apache.org/xml/features/disallow-doctype-decl", true);
+
+        return documentBuilderFactory;
+    }
+    private static void setDocumentBuilderFactoryFeature(DocumentBuilderFactory documentBuilderFactory, String feature, boolean state) {
+        try {
+            documentBuilderFactory.setFeature(feature, state);
+        } catch (Exception e) {}
+    }
 }
diff --git a/core/src/main/resources/hudson/PluginManager/_api.jelly b/core/src/main/resources/hudson/PluginManager/_api.jelly
index cd15d1398d..8ef92ccf32 100644
--- a/core/src/main/resources/hudson/PluginManager/_api.jelly
+++ b/core/src/main/resources/hudson/PluginManager/_api.jelly
@@ -31,7 +31,7 @@ THE SOFTWARE.
 
   <h2>Making sure all the needed plugins are installed</h2>
   <p>
-    Jenkins uses an XML format for representing most of complex objects internally (such as slaves, views, jobs, and builds.)
+    Jenkins uses an XML format for representing most of complex objects internally (such as agents, views, jobs, and builds.)
     As such, it has various APIs that send/receive those XMLs. For example, you can create a new job by POSTing its XML representation.
     Starting 1.482, Jenkins annotates these XMLs with additional information indicating what plugins have been used in them.
     This improves the portability of those XML files.
diff --git a/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly b/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
index d2dc352fac..99585e9896 100644
--- a/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
+++ b/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <!--
-    Publicize the TCP port number for JNLP slave agents so that they know where to conenct.
+    Publicize the TCP port number for JNLP agents so that they know where to conenct.
     Keep the legacy header for better backward compatibility
   -->
   <st:header name="X-Hudson-JNLP-Port" value="${app.tcpSlaveAgentListener.advertisedPort}" />
diff --git a/core/src/main/resources/hudson/lifecycle/Messages.properties b/core/src/main/resources/hudson/lifecycle/Messages.properties
index 76609f4b61..0439ce0fca 100644
--- a/core/src/main/resources/hudson/lifecycle/Messages.properties
+++ b/core/src/main/resources/hudson/lifecycle/Messages.properties
@@ -22,7 +22,7 @@
 
 WindowsInstallerLink.DisplayName=Install as Windows Service
 WindowsInstallerLink.Description=Installs Jenkins as a Windows service to this system, so that Jenkins starts automatically when the machine boots.
-WindowsSlaveInstaller.ConfirmInstallation=This will install a slave agent as a Windows service, so that a Jenkins slave starts automatically when the machine boots.
+WindowsSlaveInstaller.ConfirmInstallation=This will install an agent as a Windows service, so that a Jenkins agent starts automatically when the machine boots.
 WindowsSlaveInstaller.DotNetRequired=.NET Framework 2.0 or later is required for this feature
 WindowsSlaveInstaller.InstallationSuccessful=Installation was successful. Would you like to start the service now?
-WindowsSlaveInstaller.RootFsDoesntExist=Slave root directory \u2018{0}\u2019 doesn\u2019t exist
\ No newline at end of file
+WindowsSlaveInstaller.RootFsDoesntExist=Agent root directory \u2018{0}\u2019 doesn\u2019t exist
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_bg.properties b/core/src/main/resources/hudson/lifecycle/Messages_bg.properties
index 9c994c04f8..16317ae27b 100644
--- a/core/src/main/resources/hudson/lifecycle/Messages_bg.properties
+++ b/core/src/main/resources/hudson/lifecycle/Messages_bg.properties
@@ -25,9 +25,6 @@ WindowsInstallerLink.DisplayName=\
 WindowsInstallerLink.Description=\
  \u0418\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 Jenkins \u043a\u0430\u0442\u043e \u0443\u0441\u043b\u0443\u0433\u0430 \u043d\u0430 \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0438\u044f \u043d\u0430 \u0442\u0430\u0437\u0438 \u0441\u0438\u0441\u0442\u0435\u043c\u0430 Windows, \u0437\u0430\
  \u0434\u0430 \u043c\u043e\u0436\u0435 \u0442\u043e\u0439 \u0434\u0430 \u0441\u0435 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430 \u0437\u0430\u0435\u0434\u043d\u043e \u0441 \u043c\u0430\u0448\u0438\u043d\u0430\u0442\u0430.
-WindowsSlaveInstaller.ConfirmInstallation=\
- \u0422\u043e\u0432\u0430 \u0449\u0435 \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u0430\u0433\u0435\u043d\u0442 \u043a\u0430\u0442\u043e \u0443\u0441\u043b\u0443\u0433\u0430 \u043d\u0430 \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0438\u044f \u043d\u0430 \u0442\u0430\u0437\u0438 \u0441\u0438\u0441\u0442\u0435\u043c\u0430\
- Windows, \u0437\u0430 \u0434\u0430 \u043c\u043e\u0436\u0435 \u0442\u043e\u0439 \u0434\u0430 \u0441\u0435 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430 \u0437\u0430\u0435\u0434\u043d\u043e \u0441 \u043c\u0430\u0448\u0438\u043d\u0430\u0442\u0430.
 WindowsSlaveInstaller.DotNetRequired=\
  \u0417\u0430 \u0442\u043e\u0432\u0430 \u0441\u0435 \u0438\u0437\u0438\u0441\u043a\u0432\u0430 .NET Framework, \u0432\u0435\u0440\u0441\u0438\u044f 2.0 \u0438\u043b\u0438 \u043f\u043e-\u0432\u0438\u0441\u043e\u043a\u0430
 WindowsSlaveInstaller.InstallationSuccessful=\
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_da.properties b/core/src/main/resources/hudson/lifecycle/Messages_da.properties
index 6cb6cfec1a..f6efe70ed1 100644
--- a/core/src/main/resources/hudson/lifecycle/Messages_da.properties
+++ b/core/src/main/resources/hudson/lifecycle/Messages_da.properties
@@ -22,7 +22,5 @@
 
 WindowsInstallerLink.DisplayName=Installer som Windows service
 WindowsSlaveInstaller.DotNetRequired=Denne feature kr\u00e6ver .NET framework 2.0 eller nyere
-WindowsSlaveInstaller.RootFsDoesntExist=Slave roddirektorie ''{0}'' findes ikke
 WindowsSlaveInstaller.InstallationSuccessful=Installationen lykkedes. Vil du gerne starte service''en nu ?
 WindowsInstallerLink.Description=Installerer Jenkins som en Windows service p\u00e5 denne computer, s\u00e5 Jenkins starter automatisk n\u00e5r computeren starter op.
-WindowsSlaveInstaller.ConfirmInstallation=Dette vil installere en Jenkins slave agent som en Windows service, s\u00e5 Jenkins slaven vil starte automatisk n\u00e5r computeren starter op.
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_de.properties b/core/src/main/resources/hudson/lifecycle/Messages_de.properties
index 83960e0ee6..76ac1a4776 100644
--- a/core/src/main/resources/hudson/lifecycle/Messages_de.properties
+++ b/core/src/main/resources/hudson/lifecycle/Messages_de.properties
@@ -24,7 +24,5 @@ WindowsInstallerLink.DisplayName=Als Windows-Dienst installieren
 WindowsInstallerLink.Description=\
   Installiert Jenkins als Windows-Dienst: Dadurch wird Jenkins \
   automatisch nach einem Neustart des Rechners gestartet.
-WindowsSlaveInstaller.ConfirmInstallation=Dies installiert einen Slave-Agent als Windows-Dienst.	
 WindowsSlaveInstaller.DotNetRequired=.NET Framework 2.0 oder h�her ist f�r dieses Funktionsmerkmal erforderlich.
 WindowsSlaveInstaller.InstallationSuccessful=Installation erfolgreich. M�chten Sie den Dienst jetzt starten?
-WindowsSlaveInstaller.RootFsDoesntExist=Stammverzeichnis ''{0}'' existiert auf dem Slave-Knoten nicht.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_es.properties b/core/src/main/resources/hudson/lifecycle/Messages_es.properties
index e4618b85a4..2a1031893c 100644
--- a/core/src/main/resources/hudson/lifecycle/Messages_es.properties
+++ b/core/src/main/resources/hudson/lifecycle/Messages_es.properties
@@ -22,7 +22,7 @@
 
 WindowsInstallerLink.DisplayName=Instalar como un servicio de Windows
 WindowsInstallerLink.Description=Instalar Jenkins como un servicio de Windows en este sistema, de manera que Jenkins se inicie cuando el sistema arranque.
-WindowsSlaveInstaller.ConfirmInstallation=Esto instalar� el agente esclavo como un servicio de Windows.
+WindowsSlaveInstaller.ConfirmInstallation=Esto instalar� el agente como un servicio de Windows.
 WindowsSlaveInstaller.DotNetRequired=Es necesario tener instalado: .NET Framework 2.0 o posterior, para que esta caracter�stica funcione.
 WindowsSlaveInstaller.InstallationSuccessful=La instalaci�n ha sido correcta. �Quieres arrancar el servicio ahora?
-WindowsSlaveInstaller.RootFsDoesntExist=El directorio raiz {0} en el esclavo no existe.
+WindowsSlaveInstaller.RootFsDoesntExist=El directorio raiz {0} en el agente no existe.
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_ja.properties b/core/src/main/resources/hudson/lifecycle/Messages_ja.properties
index e157bec5ef..481cbd8d0e 100644
--- a/core/src/main/resources/hudson/lifecycle/Messages_ja.properties
+++ b/core/src/main/resources/hudson/lifecycle/Messages_ja.properties
@@ -22,7 +22,6 @@
 
 WindowsInstallerLink.DisplayName=Windows\u306E\u30B5\u30FC\u30D3\u30B9\u3068\u3057\u3066\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
 WindowsInstallerLink.Description=\u30DE\u30B7\u30F3\u304C\u30D6\u30FC\u30C8\u3057\u305F\u3068\u304D\u306BJenkins\u304C\u81EA\u52D5\u7684\u306B\u958B\u59CB\u3059\u308B\u3088\u3046\u306B\u3001Windows\u306E\u30B5\u30FC\u30D3\u30B9\u3068\u3057\u3066Jenkins\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u3002
-WindowsSlaveInstaller.ConfirmInstallation=\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092Windows\u306E\u30B5\u30FC\u30D3\u30B9\u3068\u3057\u3066\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u3002
 WindowsSlaveInstaller.DotNetRequired=.NET Framework 2.0 \u4EE5\u964D\u304C\u5FC5\u8981\u3067\u3059\u3002
 WindowsSlaveInstaller.InstallationSuccessful=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u304C\u6210\u529F\u3057\u307E\u3057\u305F\u3002\u4ECA\u3059\u3050\u30B5\u30FC\u30D3\u30B9\u3092\u958B\u59CB\u3057\u307E\u3059\u304B?
-WindowsSlaveInstaller.RootFsDoesntExist=\u30B9\u30EC\u30FC\u30D6\u306E\u30EB\u30FC\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA ''{0}'' \u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
\ No newline at end of file
+WindowsSlaveInstaller.RootFsDoesntExist=\u30B9\u30EC\u30FC\u30D6\u306E\u30EB\u30FC\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA ''{0}'' \u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties b/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties
index a280eaee0c..e2d80763ab 100644
--- a/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties
@@ -22,12 +22,8 @@
 
 # Install as Windows Service
 WindowsInstallerLink.DisplayName=Instalar como um servi\u00e7o do Windows
-# Slave root directory ''{0}'' doesn''t exist
-WindowsSlaveInstaller.RootFsDoesntExist=Diret\u00f3rio slave ''{0}'' n\u00e3o existe
 # .NET Framework 2.0 or later is required for this feature
 WindowsSlaveInstaller.DotNetRequired=Framework .NET 2.0 ou superior \u00e9 necess\u00e1rio
-# This will install a slave agent as a Windows service, so that a Jenkins slave starts automatically when the machine boots.
-WindowsSlaveInstaller.ConfirmInstallation=Isso instalar\u00e1 o agente slave como um servi\u00e7o do Windows, portanto ser\u00e1 iniciado junto com o Sistema Operacional
 # Installation was successful. Would you like to start the service now?
 WindowsSlaveInstaller.InstallationSuccessful=Instala\u00e7\u00e3o efetuada com sucesso. Gostaria de iniciar o servi\u00e7o agora?
 # Installs Jenkins as a Windows service to this system, so that Jenkins starts automatically when the machine boots.
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_zh_TW.properties b/core/src/main/resources/hudson/lifecycle/Messages_zh_TW.properties
index 261fc2d0f2..6986de32c6 100644
--- a/core/src/main/resources/hudson/lifecycle/Messages_zh_TW.properties
+++ b/core/src/main/resources/hudson/lifecycle/Messages_zh_TW.properties
@@ -22,7 +22,5 @@
 
 WindowsInstallerLink.DisplayName=\u5b89\u88dd\u6210 Windows \u670d\u52d9
 WindowsInstallerLink.Description=\u5c07 Jenkins \u5b89\u88dd\u6210 Windows \u670d\u52d9\uff0c\u958b\u6a5f\u5f8c Jenkins \u5c31\u6703\u81ea\u52d5\u555f\u52d5\u3002
-WindowsSlaveInstaller.ConfirmInstallation=\u5c07\u628a Slave \u4ee3\u7406\u7a0b\u5f0f\u5b89\u88dd\u6210 Windows \u670d\u52d9\uff0c\u958b\u6a5f\u5f8c Jenkins Slave \u5c31\u6703\u81ea\u52d5\u555f\u52d5\u3002
 WindowsSlaveInstaller.DotNetRequired=\u672c\u529f\u80fd\u9700\u8981 .NET Framework 2.0 \u6216\u662f\u66f4\u65b0\u7684\u7248\u672c
 WindowsSlaveInstaller.InstallationSuccessful=\u5b89\u88dd\u5b8c\u6210\u3002\u60a8\u8981\u99ac\u4e0a\u555f\u52d5\u670d\u52d9\u55ce?
-WindowsSlaveInstaller.RootFsDoesntExist=Slave \u6839\u76ee\u9304 ''{0}'' \u4e0d\u5b58\u5728
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly
index b9c8884ff2..686f05cf7e 100644
--- a/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
     <l:tasks>
       <l:task href=".." icon="icon-up icon-md" title="${%Back to Loggers}"/>
       <l:task href="." icon="icon-notepad icon-md" title="${%Log records}"/>
-      <l:task href="configure" icon="icon-setting icon-md" title="${%Configure}"/>
+      <l:task href="configure" icon="icon-gear2 icon-md" title="${%Configure}"/>
       <l:task href="delete" icon="icon-edit-delete icon-md" title="${%Delete}"/>
     </l:tasks>
   </l:side-panel>
diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly
index 7b6e2d677e..e188caed69 100644
--- a/core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly
@@ -59,7 +59,7 @@ THE SOFTWARE.
       <j:forEach var="lr" items="${it.logRecorders.values()}">
         <local:row name="${lr.name}" href="${lr.searchUrl}/">
           <a href="${lr.searchUrl}/configure">
-            <l:icon class="icon-setting icon-lg" tooltip="Configure"/>
+            <l:icon class="icon-gear2 icon-lg" tooltip="Configure"/>
           </a>
         </local:row>
       </j:forEach>
diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly
index d3d6da9935..c27d64b58a 100644
--- a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly
@@ -31,7 +31,7 @@ THE SOFTWARE.
   <l:side-panel>
     <l:tasks>
       <l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
-      <l:task href="${rootURL}/manage" icon="icon-setting icon-md" title="${%Manage Jenkins}"/>
+      <l:task href="${rootURL}/manage" icon="icon-gear2 icon-md" title="${%Manage Jenkins}"/>
       <l:task href="." icon="icon-clipboard icon-md" title="${%Logger List}"/>
       <l:task href="all" icon="icon-notepad icon-md" title="${%All Logs}"/>
       <l:task href="new" icon="icon-new-package icon-md" title="${%New Log Recorder}"/>
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties
index 7e954f6854..83030bc367 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties
@@ -32,5 +32,4 @@ Upstream\ Builds=builds pai
 Downstream\ Builds=builds filho
 none=nenhum
 Took=Demorou
-on=no slave
 Build=Build
diff --git a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity.html b/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity.html
index 02ca436656..61dd733294 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity.html
+++ b/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity.html
@@ -1,17 +1,15 @@
 <div>
-  Sometimes a project can only be successfully built on a particular slave
-  (or master).  If so, this option forces Jenkins to always build this project
-  on a specific computer.
-
-  If there is a group of machines that the job can be built on, you can specify
-  that label as the node to tie on, which will cause Jenkins to build the
-  project on any of the machines with that label.
-
+  By default, builds of this project may be executed on any build agents that
+  are available and configured to accept new builds.
   <p>
-  Otherwise, uncheck the box so that Jenkins can schedule builds on available
-  nodes, which results in faster turn-around time.
-
+  When this option is checked, you have the possibility to ensure that builds of
+  this project only occur on a certain agent, or set of agents.
   <p>
-  This option is also useful when you'd like to make sure that a project can
-  be built on a particular node.
-</div>
\ No newline at end of file
+  For example, if your project should only be built on a certain operating
+  system, or on machines that have a certain set of tools installed, or even one
+  specific machine, you can restrict this project to only execute on agents that
+  that meet those criteria.
+  <p>
+  The help text for the <i>Label Expression</i> field, shown when this option is
+  checked, provides more detailed information on how to specify agent criteria.
+</div>
diff --git a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_de.html b/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_de.html.lang,slave_rename
similarity index 88%
rename from core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_de.html
rename to core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_de.html.lang,slave_rename
index c942b354be..f2c9cd86a0 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_de.html
+++ b/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_de.html.lang,slave_rename
@@ -1,5 +1,5 @@
 <div>
-  Manchmal kann ein Projekt nur auf einem bestimmten Slave-Knoten (oder
+  Manchmal kann ein Projekt nur auf einem bestimmten Agent-Knoten (oder
   Master-Knoten) erfolgreich gebaut werden.
   
   In diesem Fall sollte diese Option angewählt werden, so daß Jenkins
diff --git a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_pt_BR.html b/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_pt_BR.html
deleted file mode 100644
index d5af2f57af..0000000000
--- a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_pt_BR.html
+++ /dev/null
@@ -1,12 +0,0 @@
-v>
-  Algumas vezes um projeto s&#243; pode ser constru&#237;do com sucesso em um slave
-  (ou master) em particular.  Se for assim, esta op&#231;&#227;o for&#231;a o Jenkins a sempre construir este projeto
-  em um computadore espec&#237;fico.
-
-  Caso contr&#225;rio, desmarque a caixa e assim o Jenkins pode agendar constru&#231;&#245;es nos n&#243;s
-  dispon&#237;veis, o que resulta em tempos de resposta mais r&#225;pidos.
-
-  <p>
-  Esta op&#231;&#227;o tam&#233;m &#233; &#250;ltil quando voc&#234; quiser ter certeza que um projeto pode
-  ser constru&#237;do em um n&#243; particular.
-</div>
diff --git a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_tr.html b/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_tr.html
deleted file mode 100644
index a5ea3ee54e..0000000000
--- a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_tr.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div>
-  Baz&#305; projeler sadece belirli slave'lerde (master'da olabilir) ba&#351;ar&#305; ile yap&#305;land&#305;r&#305;l&#305;r, 
-  bu t&#252;r durumlar i&#231;in, bu se&#231;enek projeyi daima belirli bir bilgisayarda yap&#305;land&#305;r&#305;r.
-
-  Aksi takdirde, kutucu&#287;u se&#231;ili de&#287;il halde b&#305;rak&#305;rsan&#305;z, Jenkins yap&#305;land&#305;rmay&#305;, herhangi
-  bir nod &#252;zerinde y&#252;r&#252;t&#252;r.
-  
-  <p>
-  Bir projenin sadece belli bir nod &#252;zerinde &#231;al&#305;&#351;mas&#305;n&#305; istiyorsan&#305;z bu se&#231;enek i&#351;inize
-  yarayacakt&#305;r.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_zh_TW.html b/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_zh_TW.html
deleted file mode 100644
index 1b6c7e06cd..0000000000
--- a/core/src/main/resources/hudson/model/AbstractItem/help-slaveAffinity_zh_TW.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-  有時候專案只能在特定的 Slave (或 Master) 上才能成功建置。
-  如果有這個情形，請設定這個選項，強制 Jenkins 都只在特定電腦上建置這個專案。
-
-  如果有一群主機可以建置這個專案，您可以用標籤限定要執行的節點，Jenkins 就會在有指定相同標籤的機器中挑一台來建置專案。
-
-  <p>
-  否則請不要啟用這個功能，讓 Jenkins 盡量利用有空的節點來建置，等候及執行的時間也會比較短。
-
-  <p>
-  透過這個選項，也可以讓您確認專案是否能在特定節點上建置。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace.jelly b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace.jelly
index 4882cfc5da..6a93fc14b4 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace.jelly
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace.jelly
@@ -45,7 +45,7 @@ THE SOFTWARE.
               ${%The project was renamed recently and no build was done under the new name.}
             </li>
             <li>
-              ${%The slave this project has run on for the last time was removed.}
+              ${%The agent this project has run on for the last time was removed.}
             </li>
             <li>
               ${%li3(it.workspace)}
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_da.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_da.properties
index 3db6b4afee..38f08ccf26 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_da.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_da.properties
@@ -27,4 +27,3 @@ The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new
 Projektet er blevet omd\u00f8bt for nyligt og ingen byg er endnu udf\u00f8rt under det nye navn
 Error\:\ no\ workspace=Fejl: intet arbejdsomr\u00e5de
 text=K\u00f8r et byg for at f\u00e5 Jenkins til at lave et arbejdsomr\u00e5de.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=Slaven projektet sidst k\u00f8rte p\u00e5 er blevet fjernet.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_de.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_de.properties
index 784afb23af..7c56bb5ee4 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_de.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_de.properties
@@ -27,8 +27,6 @@ There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
   Es existiert kein Arbeitsbereich f�r dieses Projekt. M�gliche Gr�nde sind:
 The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\
   Das Projekt wurde vor kurzem umbenannt und noch kein Build unter dem neuen Namen ausgef�hrt.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\
-  Der Slave, auf dem dieses Projekt das letzte Mal ausgef�hrt wurde, wurde entfernt.
 li3=Das Arbeitsbereichsverzeichnis ({0}) wurde au�erhalb von Jenkins entfernt.
 text=Starten Sie einen Build, um von Jenkins einen Arbeitsbereich anlegen zu lassen.
 The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=Der Arbeitsbereich wurde gel\u00F6scht und es wurde seitdem kein Build durchgef\u00FChrt.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_es.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_es.properties
index fc9d13524e..58f2750bb3 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_es.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_es.properties
@@ -26,7 +26,7 @@ text=Lanzar una ejecuci
 There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=No hay espacio de trabajo para este proyecto, las causas posibles son:
 The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=El proyecto se ha renombrado y no se a ejecutado desde entonces
 Error\:\ no\ workspace=Error, no hay espacio de trabajo
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=El nodo esclavo donde se ejecut� la �ltima vez se ha eliminado
+The\ agent\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=El agente donde se ejecut� la �ltima vez se ha eliminado
 
 
 The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=El espacio de trabajo se ha borrado, y no se ha ejecutado la tarea desde entonces.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_fr.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_fr.properties
index 70d43848b3..09aa434739 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_fr.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_fr.properties
@@ -24,6 +24,5 @@ Error\:\ no\ workspace=Erreur : pas de workspace
 A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Un projet n''a pas de workspace avant un premier build.
 There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=Il n''y a pas de workspace existant pour ce projet. Les raisons possibles sont :
 The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=Le projet a \u00e9t\u00e9 renomm\u00e9 r\u00e9cemment et aucun build n''a \u00e9t\u00e9 fait avec ce nouveau nom.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=La machine esclave sur laquelle ce projet a \u00e9t\u00e9 lanc\u00e9 pour la derni\u00e8re fois a \u00e9t\u00e9 retir\u00e9e.
 li3=Le r\u00e9pertoire de travail ({0}) a \u00e9t\u00e9 d\u00e9plac\u00e9 hors de Jenkins.
 text=Lancer un build afin de faire cr\u00e9er un workspace par Jenkins.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ja.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ja.properties
index 6f2a4b5185..f8332b3369 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ja.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ja.properties
@@ -27,8 +27,6 @@ There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
   \u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002\u4ee5\u4e0b\u306e\u7406\u7531\u304c\u8003\u3048\u3089\u308c\u307e\u3059\u3002
 The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\
   \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u65b0\u3057\u3044\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d\u306b\u5909\u66f4\u3055\u308c\u305f\u5f8c\u306b\u3001\u305d\u306e\u540d\u524d\u3067\u30d3\u30eb\u30c9\u304c\u5b9f\u884c\u3055\u308c\u3066\u3044\u306a\u3044\u3002
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\
-  \u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u6700\u5f8c\u306b\u5b9f\u884c\u3057\u305f\u30b9\u30ec\u30fc\u30d6\u304c\u3001\u5916\u3055\u308c\u305f\u3002
 li3=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\uff08{0}\uff09\u304cJenkins\u306e\u7ba1\u7406\u5916\u3078\u53d6\u308a\u9664\u304b\u308c\u305f\u3002
 text=\u30d3\u30eb\u30c9\u3092\u5b9f\u884c\u3057\u3066\u3001\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u3092\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=\
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_nl.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_nl.properties
index a569ad3122..2e441f2040 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_nl.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_nl.properties
@@ -24,6 +24,5 @@ Error\:\ no\ workspace=Fout : geen werkplaats beschikbaar
 A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Een project zal geen werkplaats hebben tot er op zijn mins \u00E9\u00E9n bouwpoging plaatsgevonden heeft.
 There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=Er is geen werkplaats beschikbaar voor dit project. Mogelijke redenen zijn :
 The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=Dit project werd hernoemd en heeft nog bouwpoging plaats gevonden onder de nieuwe naam.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=De slaafnode die dit project het laatst gebouwd heeft werd verwijderd.
 li3=Het pad naar de werkplaats ({0}) werd buiten Jenkins verwijderd.
 text=Lanceer een bouwpoging om Jenkins de werkplaats te laten cre\u00EBren.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties
index a05b677545..7abc056705 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties
@@ -22,7 +22,6 @@
 
 Error\:\ no\ workspace=Erro: nenhum workspace
 The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=O projeto foi renomeado recentemente e nenhum build foi feito com um novo nome.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=A m\u00e1quina slave onde esse projeto executou pela ultima vez foi removida.
 li3=O diret\u00f3rio de workspace ({0}) foi removido externamente ao Jenkins.
 text=Execute um build para que o Jenkins crie um workspace.
 There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=N\u00e3o existe nenhum workspace dispon\u00edvel para esse projeto
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ru.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ru.properties
index d3cd6ba59d..ca520bc3df 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ru.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ru.properties
@@ -27,7 +27,5 @@ There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
  \u0421\u0431\u043e\u0440\u043e\u0447\u043d\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u044b\u0435 \u043f\u0440\u0438\u0447\u0438\u043d\u044b:
 The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\
  \u041f\u0440\u043e\u0435\u043a\u0442 \u0431\u044b\u043b \u043d\u0435\u0434\u0430\u0432\u043d\u043e \u043f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d \u0438 \u0441\u0431\u043e\u0440\u043e\u043a \u043f\u043e\u0434 \u043d\u043e\u0432\u044b\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u0435\u0449\u0435 \u043d\u0435 \u0431\u044b\u043b\u043e.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\
- \u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0432\u0435\u0440, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u0441\u043e\u0431\u0438\u0440\u0430\u043b\u0441\u044f \u044d\u0442\u043e\u0442 \u043f\u0440\u043e\u0435\u043a\u0442 \u0432 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0440\u0430\u0437, \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0435\u043d.
 li3=\u0421\u0431\u043e\u0440\u043e\u0447\u043d\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f ({0}) \u0431\u044b\u043b\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u0430 \u0438\u0437 \u0440\u0430\u0431\u043e\u0447\u0435\u0433\u043e \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 Jenkins.
 text=<a href="{0}/{1}build">\u0417\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0435 \u0441\u0431\u043E\u0440\u043A\u0443</a>, \u0447\u0442\u043E\u0431\u044B \u043F\u043E\u0437\u0432\u043E\u043B\u0438\u0442\u044C Jenkins \u0441\u043E\u0437\u0434\u0430\u0442\u044C \u0441\u0431\u043E\u0440\u043E\u0447\u043D\u0443\u044E \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044E.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_tr.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_tr.properties
index aa57c21449..0696ad6f25 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_tr.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_tr.properties
@@ -26,4 +26,3 @@ Error\:\ no\ workspace=Hata\:\ \u00c7al\u0131\u015fma Alan\u0131 mevcut de\u011f
 A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Bir\ proje,\ en\ az\u0131ndan\ bir\ yap\u0131land\u0131rma\ \u00e7al\u0131\u015ft\u0131r\u0131lmadan\ bir\ \u00e7al\u0131\u015fma\ alan\u0131na\ sahip\ olamaz.
 There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=Bu\ projenin\ bir\ \u00e7al\u0131\u015fma\ alan\u0131\ yok.\ Muhtemel\ sebepler\:
 The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=Projenin\ ismi\ yeni\ de\u011fi\u015ftirildi\ ve\ yeni\ isim\ alt\u0131nda\ herhangi\ bir\ yap\u0131land\u0131rma\ \u00e7al\u0131\u015ft\u0131r\u0131lmad\u0131.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=Bu projenin en son \u00fczerinde \u00e7al\u0131\u015ft\u0131\u011f\u0131 slave silinmi\u015f.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_zh_TW.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_zh_TW.properties
index 3c48727421..c3b0d8184a 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_zh_TW.properties
@@ -26,7 +26,6 @@ A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ perfo
 There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
   \u5c08\u6848\u6c92\u6709\u5de5\u4f5c\u5340\u3002\u53ef\u80fd\u7684\u539f\u56e0\u6709:
 The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\u5C08\u6848\u6700\u8FD1\u6539\u540D\u4E86\uFF0C\u800C\u4E14\u6539\u540D\u5F8C\u9084\u6C92\u5EFA\u7F6E\u904E\u3002
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\u6700\u5F8C\u4E00\u6B21\u5EFA\u7F6E\u672C\u5C08\u6848\u7684 Slave \u88AB\u79FB\u9664\u4E86\u3002
 li3=\u5DE5\u4F5C\u5340\u76EE\u9304 ({0}) \u5728 Jenkins \u5916\u88AB\u522A\u9664\u4E86\u3002
 The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=\u5DE5\u4F5C\u5340\u88AB\u6E05\u9664\uFF0C\u800C\u4E14\u5230\u76EE\u524D\u70BA\u6B62\u9084\u6C92\u6709\u5EFA\u7F6E\u904E\u3002
 
diff --git a/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly b/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly
index 62b5bd176a..806067f210 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly
@@ -48,19 +48,17 @@ THE SOFTWARE.
 
   <p:config-assignedLabel />
 
-  <f:section title="${%Advanced Project Options}">
-    <f:advanced>
-      <p:config-quietPeriod />
-      <p:config-retryCount />
-      <p:config-blockWhenUpstreamBuilding />
-      <p:config-blockWhenDownstreamBuilding />
-      <st:include page="configure-advanced.jelly" optional="true" />
-      <f:entry title="${%Display Name}" field="displayNameOrNull">
-         <f:textbox checkUrl="'${rootURL}/checkDisplayName?displayName='+encodeURIComponent(this.value)+'&amp;jobName='+encodeURIComponent('${h.jsStringEscape(it.name)}')"/>
-      </f:entry>
-      <f:optionalBlock name="keepDependencies" checked="${it.keepDependencies}" title="${%Keep the build logs of dependencies}" help="/help/tasks/fingerprint/keepDependencies.html"/>
-    </f:advanced>
-  </f:section>
+  <f:advanced>
+    <p:config-quietPeriod />
+    <p:config-retryCount />
+    <p:config-blockWhenUpstreamBuilding />
+    <p:config-blockWhenDownstreamBuilding />
+    <st:include page="configure-advanced.jelly" optional="true" />
+    <f:entry title="${%Display Name}" field="displayNameOrNull">
+       <f:textbox checkUrl="'${rootURL}/checkDisplayName?displayName='+encodeURIComponent(this.value)+'&amp;jobName='+encodeURIComponent('${h.jsStringEscape(it.name)}')"/>
+    </f:entry>
+    <f:optionalBlock name="keepDependencies" checked="${it.keepDependencies}" title="${%Keep the build logs of dependencies}" help="/help/tasks/fingerprint/keepDependencies.html"/>
+  </f:advanced>
 
   <this:configure-scm/>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/AbstractProject/help-concurrentBuild.html b/core/src/main/resources/hudson/model/AbstractProject/help-concurrentBuild.html
index 6c5752360a..7d2116b37a 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/help-concurrentBuild.html
+++ b/core/src/main/resources/hudson/model/AbstractProject/help-concurrentBuild.html
@@ -1,24 +1,39 @@
+
 <div>
-    If this option is checked, Jenkins will schedule and execute multiple builds concurrently (provided
-    that you have sufficient executors and incoming build requests.) This is useful on builds and test jobs that
-    take a long time, as each build will only contain a smaller number of changes, and the total turn-around
-    time decreases due to the shorter time a build request spends waiting for the previous build to complete.
-    It is also very useful with parameterized builds, whose individual executions are independent from each other.
-
-    <p>
-    For other kinds of jobs, allowing concurrent executions of multiple builds may be problematic,
-    for example if it assumes a monopoly on a certain resource, like database, or for jobs where you use Jenkins
-    as a cron replacement.
-
-    <p>
-    If you use a custom workspace and enable this option, all your builds will run on the same workspace,
-    thus unless a care is taken by your side, it'll likely to collide with each other.
-    Otherwise, even when they are run on the same node, Jenkins will use different workspaces to keep
-    them isolated.
-
-    <p>
-    When Jenkins creates different workspaces for isolation, Jenkins appends "@<I>num</I>" to the
-    workspace directory name, e.g. "@2".  The separator "@" can be configured by setting the system property
-    "hudson.slaves.WorkspaceList" to the desired separator string on the Jenkins command line. 
-    E.g. "-Dhudson.slaves.WorkspaceList=-" will use a dash as separator.
+  When this option is checked, multiple builds of this project may be executed
+  in parallel.
+  <p>
+  By default, only a single build of a project is executed at a time &mdash; any
+  other requests to start building that project will remain in the build queue
+  until the first build is complete.<br>
+  This is a safe default, as projects can often require exclusive access to
+  certain resources, such as a database, or a piece of hardware.
+  <p>
+  But with this option enabled, if there are enough build executors available
+  that can handle this project, then multiple builds of this project will take
+  place in parallel.  If there are not enough available executors at any point,
+  any further build requests will be held in the build queue as normal.
+  <p>
+  Enabling concurrent builds is useful for projects that execute lengthy test
+  suites, as it allows each build to contain a smaller number of changes, while
+  the total turnaround time decreases as subsequent builds do not need to wait
+  for previous test runs to complete.<br>
+  This feature is also useful for parameterised projects, whose individual build
+  executions &mdash; depending on the parameters used &mdash; can be
+  completely independent from one another.
+  <p>
+  Each concurrently executed build occurs in its own build workspace, isolated
+  from any other builds.  By default, Jenkins appends "<tt>@&lt;num&gt;</tt>" to
+  the workspace directory name, e.g. "<tt>@2</tt>".<br>
+  The separator "<tt>@</tt>" can be changed by setting the
+  <tt>hudson.slaves.WorkspaceList</tt> Java system property when starting
+  Jenkins.  For example, "<tt>hudson.slaves.WorkspaceList=-</tt>" would change
+  the separator to a hyphen.<br>
+  For more information on setting system properties, see the <a
+  href="https://wiki.jenkins-ci.org/display/JENKINS/Features+controlled+by+system+properties"
+  target="_blank">wiki page</a>.
+  <p>
+  However, if you enable the <i>Use custom workspace</i> option, all builds will
+  be executed in the same workspace.  Therefore caution is required, as multiple
+  builds may end up altering the same directory at the same time.
 </div>
diff --git a/core/src/main/resources/hudson/model/AbstractProject/help-label.html b/core/src/main/resources/hudson/model/AbstractProject/help-label.html
index e854b1d17b..df1b6a104a 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/help-label.html
+++ b/core/src/main/resources/hudson/model/AbstractProject/help-label.html
@@ -1,52 +1,128 @@
 <div>
-    If you want to always run this project on a specific node/slave, just specify its name.
-    This works well when you have a small number of nodes.
+  Defines a logical expression which determines which agents may execute builds
+  of this project.  This expression, when tested against the name and labels of
+  each available agent, will be either <i>true</i> or <i>false</i>.  If the
+  expression evaluates to <i>true</i>, then that agent will be allowed to
+  execute builds of this project.
+  <p>
+  If this project should always be built on a specific agent, or on the Jenkins
+  master, then you can just enter the agent's name, or <code>master</code>,
+  respectively.
+  <p>
+  However, you should generally avoid using the <i>Name</i> of an agent here,
+  preferring to target the <i>Labels</i> of an agent.  As documented on the
+  configuration page for each agent, and the <i>Configure System</i> page for
+  the master, labels can be used to represent which operating system the agent
+  is running on, its CPU architecture, or any number of other characteristics.
+  <br>
+  Using labels removes the need to re-configure the label expression entered
+  here each time that you add, remove, or rename agents.
+  <p>
+  A label expression can be as simple as entering a single <b>label</b> or
+  <b>agent name</b>, for example <code>android-builder</code>, or
+  <code>linux-machine-42</code>.<br>
+  You can also make use of various <i>operators</i> to create more complex
+  expressions.
 
-    <p>
-    As the size of the cluster grows, it becomes useful not to tie projects to specific slaves,
-    as it hurts resource utilization when slaves may come and go. For such situation, assign labels
-    to slaves to classify their capabilities and characteristics, and specify a boolean expression
-    over those labels to decide where to run.
+  <h3>Supported operators</h3>
+  The following operators are supported, in descending order of precedence:
+  <dl>
+    <dt><tt>(expression)</tt></dt>
+    <dd>
+      parentheses — used to explicitly define the associativity of an expression
+    </dd>
 
-    <h3>Valid Operators</h3>
-    <p>
-    The following operators are supported, in the order of precedence.
-    <dl>
-        <dt>(expr)</dt>
-        <dd>parenthesis</dd>
+    <dt><tt>!expression</tt></dt>
+    <dd>
+      NOT — negation; the result of <tt>expression</tt> must <b>not</b> be true
+    </dd>
 
-        <dt>!expr</dt>
-        <dd>negation</dd>
+    <dt><tt>a &amp;&amp; b</tt></dt>
+    <dd>
+      AND — <b>both</b> of the expressions <tt>a</tt> and <tt>b</tt> must be
+      true
+    </dd>
 
-        <dt>expr&amp;&amp;expr</dt>
-        <dd>
-            and
-        </dd>
+    <dt><tt>a || b</tt></dt>
+    <dd>
+      OR — <b>either</b> of the expressions <tt>a</tt> or <tt>b</tt> may be
+      true
+    </dd>
 
-        <dt>expr||expr</dt>
-        <dd>
-            or
-        </dd>
+    <dt><tt>a -> b</tt></dt>
+    <dd>
+      "implies" operator — equivalent to <tt>!a || b</tt>.<br>
+      For example, <tt>windows -> x64</tt> could be thought of as "if a Windows
+      agent is used, then that agent <i>must</i> be 64-bit", while still
+      allowing this project to be executed on any agents that <i>do not</i> have
+      the <tt>windows</tt> label, regardless of whether they have also have an
+      <tt>x64</tt> label
+    </dd>
 
-        <dt>a -> b</dt>
-        <dd>
-            "implies" operator. Equivalent to <tt>!a|b</tt>.
-            For example, <tt>windows->x64</tt> could be thought of as "if run on a Windows slave,
-            that slave must be 64bit." It still allows Jenkins to run this build on linux.
-        </dd>
+    <dt><tt>a &lt;-> b</tt></dt>
+    <dd>
+      "if and only if" operator — equivalent to <tt>a &amp;&amp; b ||
+      !a &amp;&amp; !b</tt><br>
+      For example, <tt>windows &lt;-> dc2</tt> could be thought of as "if a
+      Windows agent is used, then that agent <i>must</i> be in datacenter 2, but
+      if a non-Windows agent is used, then it <i>must not</i> be in datacenter
+      2"
+    </dd>
+  </dl>
 
-        <dt>a &lt;-> b</dt>
-        <dd>
-            "if and only if" operator. Equivalent to <tt>a&amp;&amp;b || !a&amp;&amp;!b</tt>.
-            For example, <tt>windows&lt;->sfbay</tt> could be thought of as "if run on a Windows slave,
-            that slave must be in the SF bay area, but if not on Windows, it must not be in the bay area."
-        </dd>
-    </dl>
-    <p>
-    All operators are left-associative (i.e., a->b->c &lt;-> (a->b)->c )
-    An expression can contain whitespace for better readability, and it'll be ignored.
+  <h3>Notes</h3>
+  <ul>
+    <li>
+      All operators are left-associative, i.e. <tt>a -> b -> c</tt> is
+      equivalent to <tt>(a -> b) -> c</tt>.
+    </li>
+    <li>
+      Labels or agent names can be surrounded with quotation marks if they
+      contain characters that would conflict with the operator syntax.<br>
+      For example, <tt>"osx (10.11)" || "Windows Server"</tt>.
+    </li>
+    <li>
+      Expressions can be written without whitespace, but including it is
+      recommended for readability; Jenkins will ignore whitespace when
+      evaluating expressions.
+    </li>
+    <li>
+      Matching labels or agent names with wildcards or regular expressions is
+      not supported.
+    </li>
+    <li>
+      An empty expression will always evaluate to <i>true</i>, matching all
+      agents.
+    </li>
+  </ul>
 
-    <p>
-    Label names or slave names can be quoted if they contain unsafe characters. For example,
-    <tt>"jenkins-solaris (Solaris)" || "Windows 2008"</tt>
+  <h3>Examples</h3>
+  <dl>
+    <dt><tt>master</tt></dt>
+    <dd>Builds of this project may be executed only on the Jenkins master<dd>
+
+    <dt><tt>linux-machine-42</tt></dt>
+    <dd>
+      Builds of this project may be executed only on the agent with the name
+      <tt>linux-machine-42</tt> (or on any machine that happens to have a label
+      called <tt>linux-machine-42</tt>)
+    </dd>
+
+    <dt><tt>windows &amp;&amp; jdk9</tt></dt>
+    <dd>
+      Builds of this project may be executed only on any Windows agent that has
+      version 9 of the Java Development Kit installed (assuming that agents
+      with JDK 9 installed have been given a <tt>jdk9</tt> label)
+    </dd>
+
+    <dt><tt>postgres &amp;&amp; !vm &amp;&amp; (linux || freebsd)</tt></dt>
+    <dd>
+      Builds of this project may be executed only any on Linux or FreeBSD agent,
+      so long as they are <i>not</i> a virtual machine, and they have PostgreSQL
+      installed (assuming that each agent has the appropriate labels — in
+      particular, each agent running in a virtual machine must have the
+      <tt>vm</tt> label in order for this example to work as expected)
+    </dd>
+
+  </dl>
 </div>
diff --git a/core/src/main/resources/hudson/model/AbstractProject/help-label_zh_TW.html b/core/src/main/resources/hudson/model/AbstractProject/help-label_zh_TW.html
deleted file mode 100644
index 22b9144733..0000000000
--- a/core/src/main/resources/hudson/model/AbstractProject/help-label_zh_TW.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div>
-    如果您想只在特定的節點或 Slave 上建置這個專案，請直接輸入該節點的名稱。
-    在節點不多時這樣子就很好用了。
-
-    <p>
-    如果叢集越來越大，那最好不要將專案限定到某一台 Slave 上，因為 Slave 可能會來來去去，進而影響到資源利用率。
-    這種情況下，建議在 Slave 上面設定標籤，依照能力及特性分類，並設定標籤的布林表示式來決定要執行的節點。
-
-    <h3>有效的運算符號</h3>
-    <p>
-    支援下面這些運算符號，依照優先順序高到低排列。
-    <dl>
-        <dt>(expr)</dt>
-        <dd>括號</dd>
-
-        <dt>!expr</dt>
-        <dd>非</dd>
-
-        <dt>expr&amp;&amp;expr</dt>
-        <dd>
-            且
-        </dd>
-
-        <dt>expr||expr</dt>
-        <dd>
-            或
-        </dd>
-
-        <dt>a -> b</dt>
-        <dd>
-            「蘊涵」運算符號 (若 a 則 b)。等價於 <code>!a|b</code>。
-            舉例來說，<code>windows->x64</code> 可以想成是「如果在 Windows Slave 上執行，一定要 64 位元的環境」。
-            Jenkins 還是可以在 Linux 主機上面建置這個專案。
-        </dd>
-
-        <dt>a &lt;-> b</dt>
-        <dd>
-            「若且唯若」運算符號。等價於 <code>a&amp;&amp;b || !a&amp;&amp;!b</code>。
-            舉例來說，<code>windows&lt;->taipei</code> 可以想成是「如果在 Windows Slave 上執行，該節點一定要在臺北;
-            不過要是不在 Windows 上執行，就一定不能在臺北」。
-        </dd>
-    </dl>
-    <p>
-    所有運算符號都是由左向右算的 (Left-Associative; 例如 a->b->c &lt;-> (a->b)->c )
-    為了方便閱讀，表示式裡可以用半形空白，運算時會被忽略。
-
-    <p>
-    標籤名稱或 Slave 名稱中如果有不安全的字元，可以用半形括號括起來。例如:
-    <code>"jenkins-solaris (Solaris)" || "Windows 2008"</code>
-</div>
diff --git a/core/src/main/resources/hudson/model/AllView/noJob.jelly b/core/src/main/resources/hudson/model/AllView/noJob.jelly
index 5a74697978..0c9e0c26a9 100644
--- a/core/src/main/resources/hudson/model/AllView/noJob.jelly
+++ b/core/src/main/resources/hudson/model/AllView/noJob.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
   <j:choose xmlns:j="jelly:core">
     <!-- Only show the create new jobs link to those users that have permission to use it. -->
     <j:getStatic var="permission" className="hudson.model.Item" field="CREATE"/>
-    <j:when test="${h.hasPermission(permission)}">
+    <j:when test="${h.hasPermission(it.owner, permission)}">
       <div class="call-to-action">${%newJob}</div>
     </j:when>
     <j:otherwise>
diff --git a/core/src/main/resources/hudson/model/Computer/_script.jelly b/core/src/main/resources/hudson/model/Computer/_script.jelly
index bcb7e1645f..87fa923070 100644
--- a/core/src/main/resources/hudson/model/Computer/_script.jelly
+++ b/core/src/main/resources/hudson/model/Computer/_script.jelly
@@ -31,7 +31,7 @@ THE SOFTWARE.
     <pre>println System.getenv("PATH")</pre>
     <pre>println "uname -a".execute().text</pre>
     <p>
-      ${%This execution happens in the slave agent JVM.}
+      ${%This execution happens in the agent JVM.}
     </p>
   </t:scriptConsole>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/Computer/_script_da.properties b/core/src/main/resources/hudson/model/Computer/_script_da.properties
deleted file mode 100644
index 8bc4318049..0000000000
--- a/core/src/main/resources/hudson/model/Computer/_script_da.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=Denne eksekvering sker i slave agentens JVM.
diff --git a/core/src/main/resources/hudson/model/Computer/_script_de.properties b/core/src/main/resources/hudson/model/Computer/_script_de.properties
deleted file mode 100644
index 1d42d76034..0000000000
--- a/core/src/main/resources/hudson/model/Computer/_script_de.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=\
-  Diese Ausf�hrung findet in der JVM des Slave-Agenten statt.
diff --git a/core/src/main/resources/hudson/model/Computer/_script_es.properties b/core/src/main/resources/hudson/model/Computer/_script_es.properties
index acc45963cf..3c7710374d 100644
--- a/core/src/main/resources/hudson/model/Computer/_script_es.properties
+++ b/core/src/main/resources/hudson/model/Computer/_script_es.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=Esta ejecuci�n se hace en el agente de la m�quina virtual del esclavo.
+This\ execution\ happens\ in\ the\ agent\ JVM.=Esta ejecuci�n se hace en la m�quina virtual (JVM) del agente.
diff --git a/core/src/main/resources/hudson/model/Computer/_script_fr.properties b/core/src/main/resources/hudson/model/Computer/_script_fr.properties
deleted file mode 100644
index 78ac8fcafc..0000000000
--- a/core/src/main/resources/hudson/model/Computer/_script_fr.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=Cette ex�cution a lieu sur la JVM de l''agent Jenkins sur l''esclave.
diff --git a/core/src/main/resources/hudson/model/Computer/_script_ja.properties b/core/src/main/resources/hudson/model/Computer/_script_ja.properties
deleted file mode 100644
index ce17ad737a..0000000000
--- a/core/src/main/resources/hudson/model/Computer/_script_ja.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=\
-  \u30B9\u30EC\u30FC\u30D6\u306EJVM\u3067\u5B9F\u884C\u3055\u308C\u307E\u3057\u305F\u3002
diff --git a/core/src/main/resources/hudson/model/Computer/_script_ru.properties b/core/src/main/resources/hudson/model/Computer/_script_ru.properties
deleted file mode 100644
index 04f38657ea..0000000000
--- a/core/src/main/resources/hudson/model/Computer/_script_ru.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u043f\u0440\u043e\u0438\u0437\u043e\u0439\u0434\u0451\u0442 \u0432 JVM \u043f\u043e\u0434\u0447\u0438\u043d\u0451\u043d\u043d\u043e\u0433\u043e \u0443\u0437\u043b\u0430
diff --git a/core/src/main/resources/hudson/model/Computer/_script_sv_SE.properties b/core/src/main/resources/hudson/model/Computer/_script_sv_SE.properties
deleted file mode 100644
index e1d01dd5a8..0000000000
--- a/core/src/main/resources/hudson/model/Computer/_script_sv_SE.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=Detta utf\u00F6rs p\u00E5 nodens JVM.
diff --git a/core/src/main/resources/hudson/model/Computer/_script_tr.properties b/core/src/main/resources/hudson/model/Computer/_script_tr.properties
deleted file mode 100644
index 710d98527e..0000000000
--- a/core/src/main/resources/hudson/model/Computer/_script_tr.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=Bu \u00e7al\u0131\u015fma slave ajan\u0131n\u0131n JVM''i \u00fczerinde yap\u0131lmaktad\u0131r.
diff --git a/core/src/main/resources/hudson/model/Computer/_script_zh_TW.properties b/core/src/main/resources/hudson/model/Computer/_script_zh_TW.properties
deleted file mode 100644
index e7d191f786..0000000000
--- a/core/src/main/resources/hudson/model/Computer/_script_zh_TW.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=\u5728 Slave \u4ee3\u7406\u7a0b\u5f0f\u7684 JVM \u4e2d\u57f7\u884c\u3002
diff --git a/core/src/main/resources/hudson/model/Computer/custom-jnlp.jelly b/core/src/main/resources/hudson/model/Computer/custom-jnlp.jelly
index df19f8cd2c..6f6cbfb2f3 100644
--- a/core/src/main/resources/hudson/model/Computer/custom-jnlp.jelly
+++ b/core/src/main/resources/hudson/model/Computer/custom-jnlp.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
     <l:main-panel>
       <h1>Tweak Launch Parameters</h1>
       <p>
-        This page allows you to tweak the JVM parameters when launching JNLP slave agents.
+        This page allows you to tweak the JVM parameters when launching JNLP agents.
         <!-- TODO: work from home for the rest -->
       </p>
     </l:main-panel>
diff --git a/core/src/main/resources/hudson/model/Computer/delete.jelly b/core/src/main/resources/hudson/model/Computer/delete.jelly
index 2ae6fea176..2f88351c6a 100644
--- a/core/src/main/resources/hudson/model/Computer/delete.jelly
+++ b/core/src/main/resources/hudson/model/Computer/delete.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
 		<st:include page="sidepanel.jelly" />
 		<l:main-panel>
 		  <form method="post" action="doDelete">
-		    ${%Are you sure about deleting the slave?}
+		    ${%Are you sure about deleting the agent?}
         <f:submit value="${%Yes}" />
 		  </form>
 		</l:main-panel>
diff --git a/core/src/main/resources/hudson/model/Computer/delete_da.properties b/core/src/main/resources/hudson/model/Computer/delete_da.properties
index 41b74dfc8e..1d3dcce7bd 100644
--- a/core/src/main/resources/hudson/model/Computer/delete_da.properties
+++ b/core/src/main/resources/hudson/model/Computer/delete_da.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 Yes=Ja
-Are\ you\ sure\ about\ deleting\ the\ slave?=Er du sikker p\u00e5 at du vil slette slaven?
diff --git a/core/src/main/resources/hudson/model/Computer/delete_de.properties b/core/src/main/resources/hudson/model/Computer/delete_de.properties
index 4e7fdd0036..2593097cb4 100644
--- a/core/src/main/resources/hudson/model/Computer/delete_de.properties
+++ b/core/src/main/resources/hudson/model/Computer/delete_de.properties
@@ -1,2 +1 @@
-Are\ you\ sure\ about\ deleting\ the\ slave?=M�chten Sie den Slave-Knoten wirklich l�schen?
 Yes=Ja
diff --git a/core/src/main/resources/hudson/model/Computer/delete_es.properties b/core/src/main/resources/hudson/model/Computer/delete_es.properties
index 986f8ac888..2bfd1f95b0 100644
--- a/core/src/main/resources/hudson/model/Computer/delete_es.properties
+++ b/core/src/main/resources/hudson/model/Computer/delete_es.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Are\ you\ sure\ about\ deleting\ the\ slave?=�Est�s seguro de querer borrar este esclavo?
+Are\ you\ sure\ about\ deleting\ the\ agent?=�Est�s seguro de querer borrar este agente?
 Yes=S�
diff --git a/core/src/main/resources/hudson/model/Computer/delete_fr.properties b/core/src/main/resources/hudson/model/Computer/delete_fr.properties
index f939cafb6a..50339e156c 100644
--- a/core/src/main/resources/hudson/model/Computer/delete_fr.properties
+++ b/core/src/main/resources/hudson/model/Computer/delete_fr.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Are\ you\ sure\ about\ deleting\ the\ slave?=Etes-vous s�r de vouloir supprimer cet esclave?
 Yes=Oui
diff --git a/core/src/main/resources/hudson/model/Computer/delete_ja.properties b/core/src/main/resources/hudson/model/Computer/delete_ja.properties
index 9eb4b9e52f..22f770e0f0 100644
--- a/core/src/main/resources/hudson/model/Computer/delete_ja.properties
+++ b/core/src/main/resources/hudson/model/Computer/delete_ja.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Yes=\u306F\u3044
-Are\ you\ sure\ about\ deleting\ the\ slave?=\u30B9\u30EC\u30FC\u30D6\u3092\u524A\u9664\u3057\u3066\u3088\u308D\u3057\u3044\u3067\u3059\u304B?
\ No newline at end of file
+Yes=\u306F\u3044
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties
index d3a3105c4a..60797521ae 100644
--- a/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 Yes=Sim
-Are\ you\ sure\ about\ deleting\ the\ slave?=Tem certeza que deseja remover esse slave?
diff --git a/core/src/main/resources/hudson/model/Computer/delete_ru.properties b/core/src/main/resources/hudson/model/Computer/delete_ru.properties
index 7259f6d977..b7b2dfd7e2 100644
--- a/core/src/main/resources/hudson/model/Computer/delete_ru.properties
+++ b/core/src/main/resources/hudson/model/Computer/delete_ru.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Are\ you\ sure\ about\ deleting\ the\ slave?=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B, \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u043E\u0434\u0447\u0438\u043D\u0435\u043D\u043D\u044B\u0439 \u0443\u0437\u0435\u043B?
 Yes=\u0414\u0430
diff --git a/core/src/main/resources/hudson/model/Computer/delete_zh_TW.properties b/core/src/main/resources/hudson/model/Computer/delete_zh_TW.properties
index caa065d636..83db3cdbc3 100644
--- a/core/src/main/resources/hudson/model/Computer/delete_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/Computer/delete_zh_TW.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Are\ you\ sure\ about\ deleting\ the\ slave?=\u78ba\u5b9a\u8981\u522a\u9664 Slave?
 Yes=\u662f
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
index 2a74c154e7..d3c30c47a1 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
     <l:tasks>
       <l:task contextMenu="false" href="${rootURL}/computer" icon="icon-up icon-md" title="${%Back to List}"/>
       <l:task contextMenu="false" href="${rootURL}/${it.url}" icon="icon-search icon-md" title="${%Status}"/>
-      <l:task href="${rootURL}/${it.url}delete" icon="icon-edit-delete icon-md" permission="${it.DELETE}" title="${%Delete Slave}"/>
+      <l:task href="${rootURL}/${it.url}delete" icon="icon-edit-delete icon-md" permission="${it.DELETE}" title="${%Delete Agent}"/>
       <l:task href="${rootURL}/${it.url}configure" icon="icon-setting icon-md" permission="${it.CONFIGURE}" title="${%Configure}"/>
       <l:task href="${rootURL}/${it.url}builds" icon="icon-notepad icon-md" title="${%Build History}"/>
       <l:task href="${rootURL}/${it.url}load-statistics" icon="icon-monitor icon-md" title="${%Load Statistics}"/>
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_bg.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_bg.properties
index d7d2c90921..636f438c66 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_bg.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_bg.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=\u041E\u0431\u0440\u0430\u0442\u043D\u043E \u043A\u044A\u043C \u0441\u043F\u0438\u0441\u044A\u043A\u0430
 Build\ History=\u0418\u0441\u0442\u043E\u0440\u0438\u044F \u043D\u0430 \u0431\u0438\u043B\u0434\u0430
 Configure=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430
-Delete\ Slave=\u0418\u0437\u0442\u0440\u0438\u0439 \u043C\u0430\u0448\u0438\u043D\u0430
 Load\ Statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 \u043D\u0430 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043D\u0438\u044F\u0442\u0430
 Script\ Console=\u041A\u043E\u043D\u0437\u043E\u043B\u0430 
 Status=\u0421\u0442\u0430\u0442\u0443\u0441
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_cs.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_cs.properties
index 4facbaf734..c4bb2a911c 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_cs.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_cs.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=Zp\u011Bt na seznam
 Build\ History=Historie sestaven\u00ED
 Configure=Nastavit
-Delete\ Slave=Vymazat server
 Load\ Statistics=Na\u010D\u00EDst statistiku
 Script\ Console=Konzole
 Status=Stav
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_da.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_da.properties
index 62d0db6dbf..44c72e343a 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_da.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_da.properties
@@ -22,7 +22,6 @@
 
 Configure=Konfigurer
 Status=Status
-Delete\ Slave=Slet slave
 Build\ History=Byggehistorik
 Load\ Statistics=Belastningsstatistik
 Back\ to\ List=Tilbage til liste
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_de.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_de.properties
index 2fa34e5fa0..b927f03b5a 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_de.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_de.properties
@@ -24,6 +24,5 @@ Back\ to\ List=Zur
 Build\ History=Build-Verlauf
 Script\ Console=Script-Konsole
 Status=Status
-Delete\ Slave=Slave l�schen
 Configure=Konfigurieren
 Load\ Statistics=Auslastung
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_eo.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_eo.properties
deleted file mode 100644
index 0c86aa471d..0000000000
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_eo.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-Delete\ Slave=Nuligi sklavon
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_es.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_es.properties
index d8b9a2d6d9..c96d7bb82d 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_es.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_es.properties
@@ -22,7 +22,7 @@
 
 Back\ to\ List=Volver
 Status=Estado
-Delete\ Slave=Borrar esclavo
+Delete\ Agent=Borrar agente
 Configure=Configurar
 Build\ History=Historia de ejecuciones
 Load\ Statistics=Cargar estad�sticas
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_fi.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_fi.properties
index f3fb8825cc..9049275c32 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_fi.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_fi.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=Takaisin listaan
 Build\ History=K\u00E4\u00E4nn\u00F6shistoria
 Configure=Konfiguroi
-Delete\ Slave=Poista suorittaja
 Load\ Statistics=Kuormatilastot
 Script\ Console=Skriptikonsoli
 Status=Tila
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_fr.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_fr.properties
index 3c7a539c24..63d8626ee3 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_fr.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_fr.properties
@@ -24,7 +24,6 @@ Back\ to\ List=Retour 
 Build\ History=Historique des constructions
 Script\ Console=Console de script
 Status=Statut
-Delete\ Slave=Supprimer l\u2019esclave
 Configure=Configurer
 Load\ Statistics=Statistiques d\u2019utilisation
 
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_he.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_he.properties
index 17436729ee..992f7a1f66 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_he.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_he.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=\u05D7\u05D6\u05E8\u05D4 \u05DC\u05E8\u05E9\u05D9\u05DE\u05D4
 Build\ History=\u05D4\u05D9\u05E1\u05D8\u05D5\u05E8\u05D9\u05D9\u05EA \u05D1\u05E0\u05D9\u05D5\u05EA
 Configure=\u05E7\u05D1\u05D9\u05E2\u05EA \u05EA\u05E6\u05D5\u05E8\u05D4
-Delete\ Slave=\u05DE\u05D7\u05D9\u05E7\u05EA \u05EA\u05D7\u05E0\u05D4
 Load\ Statistics=\u05E1\u05D8\u05D8\u05D9\u05E1\u05D8\u05D9\u05E7\u05D5\u05EA \u05D4\u05E2\u05D5\u05DE\u05E1
 Script\ Console=\u05DE\u05E1\u05D5\u05E3 \u05D4\u05E1\u05E7\u05E8\u05D9\u05E4\u05D8\u05D9\u05DD
 Status=\u05E1\u05D8\u05D8\u05D5\u05E1
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_it.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_it.properties
index 62bd6909dc..3e3dab4a43 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_it.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_it.properties
@@ -3,6 +3,5 @@
 Back\ to\ List=Torna alla Lista
 Build\ History=Storia dei Build
 Configure=Configura
-Delete\ Slave=Cancella Slave
 Load\ Statistics=Carica Statistiche
 Status=Stato
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_ja.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_ja.properties
index 7ab2d427d6..ed49c9c3b9 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_ja.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_ja.properties
@@ -22,7 +22,6 @@
 
 Back\ to\ List=\u30EA\u30B9\u30C8\u3078\u623B\u308B
 Status=\u72B6\u614B
-Delete\ Slave=\u30B9\u30EC\u30FC\u30D6\u524A\u9664
 Configure=\u8A2D\u5B9A
 Build\ History=\u30D3\u30EB\u30C9\u5C65\u6B74
 Load\ Statistics=\u8CA0\u8377\u7D71\u8A08
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_ko.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_ko.properties
index 23a3838f62..5c29487638 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_ko.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_ko.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=\uBAA9\uB85D\uC73C\uB85C \uB3CC\uC544\uAC00\uAE30
 Build\ History=\uBE4C\uB4DC \uAE30\uB85D
 Configure=\uC124\uC815
-Delete\ Slave=Slave \uC0AD\uC81C
 Load\ Statistics=\uD1B5\uACC4\uBCF4\uAE30
 Script\ Console=\uC2A4\uD06C\uB9BD\uD2B8 \uCF58\uC194
 Status=\uC0C1\uD0DC
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_lt.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_lt.properties
index d06880df35..10e449ee00 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_lt.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_lt.properties
@@ -23,6 +23,5 @@
 Back\ to\ List=Atgal \u012F s\u0105ra\u0161\u0105
 Build\ History=Darb\u0173 istorija
 Configure=Nustatymai
-Delete\ Slave=I\u0161trinti ''Slave''
 Load\ Statistics=Kr\u016Bvio statistika
 Status=B\u016Bsena
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_lv.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_lv.properties
index 2b1f18e714..8f90d430a6 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_lv.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_lv.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=Atpaka\u013C pie saraksta
 Build\ History=B\u016Bv\u0113jumu v\u0113sture
 Configure=Konfigur\u0113t
-Delete\ Slave=Dz\u0113st pak\u0101rtoto izpild\u012Btaju
 Load\ Statistics=Noslodzes statistika
 Script\ Console=Skriptu konsole
 Status=St\u0101voklis
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_nb_NO.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_nb_NO.properties
index 0a9fcd4fec..8a56a4ddd5 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_nb_NO.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_nb_NO.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=Tilbake til listen
 Build\ History=Bygghistorikk
 Configure=Konfigur\u00E9r
-Delete\ Slave=Slett slave
 Load\ Statistics=Laststatistikk
 Script\ Console=Skriptekonsoll
 Status=Status
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_nl.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_nl.properties
index bc7f5949bd..654c2904d9 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_nl.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_nl.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=Terug naar overzicht
 Build\ History=Bouwhistorie
 Configure=Configureren
-Delete\ Slave=Verwijderen
 Load\ Statistics=Belastings statistieken
 Script\ Console=Scriptconsole
 Status=Status
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_pl.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_pl.properties
index bd34753cda..2ddc6acd17 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_pl.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_pl.properties
@@ -23,6 +23,5 @@
 Back\ to\ List=Powr\u00F3t do listy
 Build\ History=Historia kompilacji
 Configure=Konfiguruj
-Delete\ Slave=Usu\u0144 Slave
 Load\ Statistics=Statystyka obci\u0105\u017Cenia
 Script\ Console=Konsola skrypt\u00F3w
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties
index b91be21c9d..20731bae6a 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties
@@ -24,6 +24,5 @@ Back\ to\ List=Voltar para a lista
 Build\ History=Hist\u00f3rico de builds
 Configure=Configurar
 Status=Situa\u00e7\u00e3o
-Delete\ Slave=Remover slave
 Load\ Statistics=Estat\u00edsticas de carga
 Script\ Console=Terminal de script
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_pt_PT.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_pt_PT.properties
index 677b381cb6..7581da9c23 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_pt_PT.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_pt_PT.properties
@@ -3,6 +3,5 @@
 Back\ to\ List=Voltar para a Lista
 Build\ History=Hist\u00F3rico de Compila\u00E7\u00F5es
 Configure=Configurar
-Delete\ Slave=Apagar Escravo
 Load\ Statistics=Carregar Estat\u00EDsticas
 Status=Estado
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_ru.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_ru.properties
index b8be6235c7..269c911a88 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_ru.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_ru.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043a \u0441\u043f\u0438\u0441\u043a\u0443
 Build\ History=\u0418\u0441\u0442\u043e\u0440\u0438\u044f \u0441\u0431\u043e\u0440\u043e\u043a
 Configure=\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c
-Delete\ Slave=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0439 \u0443\u0437\u0435\u043b
 Load\ Statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f
 Script\ Console=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0441\u0446\u0435\u043d\u0430\u0440\u0438\u0435\u0432
 Status=\u0421\u0442\u0430\u0442\u0443\u0441
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_sk.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_sk.properties
index e79975c893..3e9548696e 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_sk.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_sk.properties
@@ -3,7 +3,6 @@
 Back\ to\ List=Nasp\u00E4\u0165 na zoznam
 Build\ History=Hist\u00F3ria zostaven\u00ED
 Configure=Konfiguruj
-Delete\ Slave=Vyma\u017E stroj
 Load\ Statistics=\u0160tatistiky vy\u0165a\u017Eenia
 Script\ Console=Skriptov\u00E1 konzola
 Status=Stav
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_sv_SE.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_sv_SE.properties
index 6d9abb2fd5..c98df81fab 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_sv_SE.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_sv_SE.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=Tillbaka till nodlista
 Build\ History=Jobbhistorik
 Configure=Konfigurera
-Delete\ Slave=Ta bort nod
 Load\ Statistics=Belastningstatistik
 Script\ Console=Skriptkonsoll
 Status=Status
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_tr.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_tr.properties
index 300309ef65..87af65f9c3 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_tr.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_tr.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=Listeye D\u00f6n
 Build\ History=Yap\u0131land\u0131rma Ge\u00e7mi\u015fi
 Configure=Yap\u0131land\u0131r
-Delete\ Slave=Ba\u011F\u0131l\u0131(Slave) sil
 Load\ Statistics=Y\u00FCklenme istatistikleri
 Script\ Console=Script\ Konsolu
 Status=Durum
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_uk.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_uk.properties
index c103c89144..8917b1c57c 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_uk.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_uk.properties
@@ -3,7 +3,6 @@
 Back\ to\ List=\u041F\u043E\u0432\u0435\u0440\u043D\u0443\u0442\u0438\u0441\u044C \u0434\u043E \u0441\u043F\u0438\u0441\u043A\u0443
 Build\ History=\u0406\u0441\u0442\u043E\u0440\u0456\u044F \u043F\u043E\u0431\u0443\u0434\u043E\u0432
 Configure=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F
-Delete\ Slave=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438 Slave
 Load\ Statistics=\u0417\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0438\u0442\u0438 \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0443
 Script\ Console=\u0421\u043A\u0440\u0438\u043F\u0442\u043E\u0432\u0430 \u043A\u043E\u043D\u0441\u043E\u043B\u044C
 Status=\u0421\u0442\u0430\u0442\u0443\u0441
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_zh_CN.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_zh_CN.properties
index 547bb7a6f4..0861540bb9 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_zh_CN.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_zh_CN.properties
@@ -23,7 +23,6 @@
 Back\ to\ List=\u8fd4\u56de\u5217\u8868
 Build\ History=\u6784\u5efa\u5386\u53f2
 Configure=\u914D\u7F6E\u4ECE\u8282\u70B9
-Delete\ Slave=\u5220\u9664\u5B50\u8282\u70B9
 Load\ Statistics=\u8d1f\u8f7d\u7edf\u8ba1
 Script\ Console=\u811a\u672c\u547d\u4ee4\u884c
 Status=\u72b6\u6001
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_zh_TW.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_zh_TW.properties
index fdc17d9b14..88ef844bb3 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel_zh_TW.properties
@@ -22,7 +22,6 @@
 
 Back\ to\ List=\u56DE\u5230\u6E05\u55AE
 Status=\u72C0\u614B
-Delete\ Slave=\u522A\u9664 Slave
 Configure=\u8A2D\u5B9A
 Build\ History=\u5EFA\u69CB\u6B77\u53F2
 Load\ Statistics=\u8CA0\u8F09\u7D71\u8A08
diff --git a/core/src/main/resources/hudson/model/ComputerSet/index.jelly b/core/src/main/resources/hudson/model/ComputerSet/index.jelly
index 421865bd2c..22a8f39e34 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/index.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/index.jelly
@@ -68,7 +68,7 @@ THE SOFTWARE.
           <td><!-- config link -->
             <j:if test="${c.hasPermission(c.CONFIGURE)}">
               <a href="${rootURL}/${c.url}configure">
-                <l:icon class="icon-setting icon-lg" tooltip="${%Configure}"/>
+                <l:icon class="icon-gear2 icon-lg" tooltip="${%Configure}"/>
               </a>
             </j:if>
           </td>
diff --git a/core/src/main/resources/hudson/model/ComputerSet/new.jelly b/core/src/main/resources/hudson/model/ComputerSet/new.jelly
index 8f3b7076de..403cf5d9ff 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/new.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/new.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <!--
-  "New slave" page.
+  "New agent" page.
 
   The flow of this is:
 
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly b/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
index 831ca12d7e..59973506f5 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
@@ -32,9 +32,9 @@ THE SOFTWARE.
     <j:getStatic var="createPermission" className="hudson.model.Computer" field="CREATE"/>
     <l:tasks>
       <l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
-      <l:task href="${rootURL}/manage" icon="icon-setting icon-md" permission="${app.ADMINISTER}" title="${%Manage Jenkins}"/>
+      <l:task href="${rootURL}/manage" icon="icon-gear2 icon-md" permission="${app.ADMINISTER}" title="${%Manage Jenkins}"/>
       <l:task href="new" icon="icon-new-computer icon-md" permission="${createPermission}" title="${%New Node}"/>
-      <l:task href="configure" icon="icon-setting icon-md" permission="${app.ADMINISTER}" title="${%Configure}"/>
+      <l:task href="configure" icon="icon-gear2 icon-md" permission="${app.ADMINISTER}" title="${%Configure}"/>
     </l:tasks>
     <t:queue items="${app.queue.items}" />
     <t:executors />
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.jelly b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.jelly
index 583f693ef4..f720e3e513 100644
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.jelly
+++ b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.jelly
@@ -24,5 +24,5 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <div>
-  ${%body}
+  ${it.description}
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.properties
deleted file mode 100644
index bc37f9ffb7..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=\
-  This is the central feature of Jenkins. Jenkins will build your project, \
-  combining any SCM with any build system, and this can be even used \
-  for something other than software build.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ar.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ar.properties
deleted file mode 100644
index 8d8fada25e..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ar.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=\u0647\u0630\u0647 \u0647\u064A \u0627\u0644\u0645\u064A\u0632\u0629 \u0627\u0644\u0631\u0626\u064A\u0633\u064A\u0629 \u0641\u064A \u062C\u0646\u0643\u0646\u0632. \u062C\u0646\u0643\u0646\u0632 \u0633\u064A\u0628\u0646\u064A \u0644\u0643 \u0645\u0634\u0631\u0648\u0639\u0643\u060C \u064A\u0633\u062A\u062E\u062F\u0645 \u0623\u062F\u0648\u0627\u062A \u0645\u0631\u0627\u0642\u0628\u0629 \u0627\u0644\u0645\u0635\u062F\u0631 \u0627\u0644\u0628\u0631\u0645\u062C\u064A\u060C \u0648\u064A\u0645\u0643\u0646 \u062D\u062A\u0649 \u0627\u0633\u062A\u062E\u062F\u0627\u0645\u0647\u0627 \uFEF7\u0634\u064A\u0627\u0621 \u063A\u064A\u0631 \u0628\u0646\u0627\u0621 \u0627\u0644\u0645\u0634\u0631\u0648\u0639.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_bg.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_bg.properties
deleted file mode 100644
index 6ea50ab22d..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_bg.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=\u0422\u043E\u0432\u0430 \u0435 \u043E\u0441\u043D\u043E\u0432\u043D\u0430 \u0444\u0443\u043D\u043A\u0446\u0438\u043E\u043D\u0430\u043B\u043D\u043E\u0441\u0442 \u0432 Jenkins. Jenkins \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u0438\u043B\u0434\u043D\u0435 \u0432\u0430\u0448 \u043F\u0440\u043E\u0435\u043A\u0442 \u043A\u043E\u043C\u0431\u0438\u043D\u0438\u0440\u0430\u0439\u043A\u0438 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u043B\u0435\u043D \u0441\u043E\u0440\u0441 \u043A\u043E\u043D\u0442\u0440\u043E\u043B \u0441 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u043B\u043D\u0430 \u0431\u0438\u043B\u0434 \u0441\u0438\u0441\u0442\u0435\u043C\u0430, \u043A\u0430\u0442\u043E \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0440\u0438 \u0434\u0430 \u0433\u043E \u043F\u043E\u043B\u0437\u0432\u0430\u0442\u0435 \u0438 \u0437\u0430 \u0434\u0440\u0443\u0433\u0438 \u0446\u0435\u043B\u0438 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u0438 \u043E\u0442 \u0431\u0438\u043B\u0434\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u043E\u0444\u0442\u0443\u0435\u0440.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ca.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ca.properties
deleted file mode 100644
index 0b991b6b82..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ca.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=Aquesta \u00E9s la funcionalitat principal de Jenkins. Jenkins far\u00E0 un build del vostre projecte combinant qualsevol SCM amb qualsevol sistema de build. Aix\u00F2 tamb\u00E9 es pot usar per tasques que no siguin un build de software 
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_cs.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_cs.properties
deleted file mode 100644
index 15a4df88a9..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_cs.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=Toto je hlavn\u00ED funkce Jenkins. Jenkins sestav\u00ED v\u00E1\u0161 projekt, spoj\u00ED jak\u00FDkoli syst\u00E9m pro spr\u00E1vu verz\u00ED se syst\u00E9mem pro sestaven\u00ED. Nemus\u00ED b\u00FDt pou\u017Eit jen pro sestaven\u00ED softwaru.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_da.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_da.properties
deleted file mode 100644
index b4febcef13..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_da.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=Dette er den centrale feature i Jenkins. Jenkins vil bygge dit projekt i enhver kombination af kildekodestyring (SCM) med ethvert byggesystem og dette kan bruges til meget andet end at bygge software.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_de.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_de.properties
deleted file mode 100644
index 7ba8a96e3c..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_de.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=\
-  Dieses Profil ist das meistgenutzte in Jenkins. Jenkins baut Ihr Projekt, wobei Sie \
-  universell jedes SCM System mit jedem Build-Verfahren kombinieren k�nnen. Dieses Profil \
-  ist nicht nur auf das Bauen von Software beschr�nkt, sondern kann dar�ber hinaus \
-  auch f�r weitere Anwendungsgebiete verwendet werden.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_es.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_es.properties
deleted file mode 100644
index ec45052877..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_es.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=\
-  Esta es la caracter�stica principal de Jenkins, la de ejecutar el proyecto combinando cualquier tipo \
-  de repositorio de software (SCM) con cualquier modo de construccion o ejecuci�n (make, ant, mvn, rake, script ...). \
-  Por tanto se podr� tanto compilar y empaquetar software, como ejecutar cualquier proceso que requiera monitorizaci�n.
-
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_et.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_et.properties
deleted file mode 100644
index c3c69a972c..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_et.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=See on Jenkinsi p\u00F5hifunktsioon! Jenkins ehitab su projekti, kombineerides sinu versioonihalduse mistahes ehitusprotsessiga. Sa v\u00F5id seda kasutada ka muudeks asjadeks kui tarkvara ehitamine.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_fi.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_fi.properties
deleted file mode 100644
index aca64302b7..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_fi.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=T\u00E4m\u00E4 on Jenkins t\u00E4rkein ominaisuus. Jenkins rakentaa projektisi k\u00E4ytt\u00E4en versionhallintaa ja buildij\u00E4rjestelmi\u00E4. Voit k\u00E4ytt\u00E4\u00E4 t\u00E4t\u00E4 my\u00F6s muuhun kuin ohjelmien k\u00E4\u00E4nt\u00E4miseen.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_fr.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_fr.properties
deleted file mode 100644
index 441d616f50..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_fr.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=Ceci est la fonction principale de Jenkins qui sert \u00E0 builder (construire) votre projet. <br>Vous pouvez int\u00E9grer tous les outils de gestion de version avec tous les syst\u00E8mes de build. <br>Il est m\u00EAme possible d''utiliser Jenkins pour tout autre chose qu''un build logiciel.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_hi_IN.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_hi_IN.properties
deleted file mode 100644
index f83456bd02..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_hi_IN.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=\u092F\u0939 \u091C\u0947\u0928\u0915\u0940\u0902\u0938 \u0915\u0940 \u0915\u0947\u0902\u0926\u094D\u0930\u0940\u092F \u0935\u093F\u0936\u0947\u0937\u0924\u093E \u0939\u0948\u0964 \u091C\u0947\u0928\u0915\u0940\u0902\u0938, \u0915\u093F\u0938\u0940 \u092D\u0940 \u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u092A\u094D\u0930\u0923\u093E\u0932\u0940 \u0915\u0947 \u0938\u093E\u0925 \u0915\u093F\u0938\u0940 \u092D\u0940 \u0938\u0949\u092B\u094D\u091F\u0935\u0947\u092F\u0930 \u0935\u093F\u0928\u094D\u092F\u093E\u0938 \u092A\u094D\u0930\u092C\u0902\u0927\u0928 \u0915\u093E \u0938\u0902\u092F\u094B\u091C\u0928 \u0915\u0930\u0915\u0947 \u0906\u092A\u0915\u0940 \u092A\u0930\u093F\u092F\u094B\u091C\u0928\u093E \u0915\u093E \u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u0915\u0930\u0947\u0917\u093E, \u0914\u0930 \u0907\u0938\u0915\u093E \u092A\u094D\u0930\u092F\u094B\u0917 \u0938\u0949\u092B\u094D\u091F\u0935\u0947\u092F\u0930 \u0915\u093E \u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u0915\u0930\u0928\u0947 \u0915\u0947 \u0905\u0932\u093E\u0935\u093E \u0905\u0928\u094D\u092F \u0915\u093E\u0930\u094D\u092F\u094B\u0902 \u0915\u0947 \u0932\u093F\u090F \u092D\u0940 \u0915\u093F\u092F\u093E \u091C\u093E \u0938\u0915\u0924\u093E \u0939\u0948.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_id.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_id.properties
deleted file mode 100644
index 0bd7d5726c..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_id.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=Ini adalah fitur sentral dari Jenkins. Jenkins akan membangun proyek anda, mengkombinasikan SCM apa pun dengan sistem pembangunan,  dan ini akan digunakan untuk sesuatu selain pembangunan piranti lunak.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_it.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_it.properties
deleted file mode 100644
index 09ff3126d8..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_it.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=Questa \u00E8 la funzione principale di Jenkins. Jenkins effettuer\u00E0 una compilazione del progetto, combinando qualsiasi SCM con qualsiasi sistema di compilazione e si pu\u00F2 usare anche per qualcosa di altro che non sia un programma di compilazione.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ja.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ja.properties
deleted file mode 100644
index 35598f0d33..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ja.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=\
-  \u3082\u3063\u3068\u3082\u6c4e\u7528\u6027\u306e\u9ad8\u3044Jenkins\u306e\u4e2d\u6838\u6a5f\u80fd\u3067\u3059\u3002\u4efb\u610f\u306eSCM\u304b\u3089\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3001\
-  \u4efb\u610f\u306e\u30d3\u30eb\u30c9\u30b7\u30b9\u30c6\u30e0\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u30d3\u30eb\u30c9\u3067\u304d\u307e\u3059\u3002\u5f80\u3005\u306b\u3057\u3066\u3001\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306e\u30d3\u30eb\u30c9\u4ee5\u5916\u306b\u3082\
-  \u69d8\u3005\u306a\u4ed5\u4e8b\u306e\u81ea\u52d5\u5316\u306b\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ko.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ko.properties
deleted file mode 100644
index e75ffeb39a..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ko.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=\uC774\uAC83\uC740 Jenkins\uC758 \uC8FC\uC694 \uAE30\uB2A5\uC785\uB2C8\uB2E4. Jenkins\uC740 \uC5B4\uB290 \uBE4C\uB4DC \uC2DC\uC2A4\uD15C\uACFC \uC5B4\uB5A4 SCM(\uD615\uC0C1\uAD00\uB9AC)\uC73C\uB85C \uBB36\uC778 \uB2F9\uC2E0\uC758 \uD504\uB85C\uC81D\uD2B8\uB97C \uBE4C\uB4DC\uD560 \uAC83\uC774\uACE0, \uC18C\uD504\uD2B8\uC6E8\uC5B4 \uBE4C\uB4DC\uBCF4\uB2E4 \uB2E4\uB978 \uC5B4\uB5A4 \uAC83\uC5D0 \uC790\uC8FC \uC0AC\uC6A9\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_lt.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_lt.properties
deleted file mode 100644
index 60ae6f7c9d..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_lt.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=Pagrindin\u0117 Jenkins funkcija. Jenkins sukonstruos j\u016Bs\u0173 projekt\u0105,  sujungdamas betkok\u012F SCM su betkokia konstravimo sistema. \u0160is darbo tipas gali b\u016Bt pritaikytas ne tik program\u0173 konstravimui.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_nb_NO.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_nb_NO.properties
deleted file mode 100644
index 1d8c467e71..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_nb_NO.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=Dette er en sentral egenskap ved Jenkins. Jenkins bygger dine prosjekter, kombinerer SCM (Source Control Management - Kildekodekontrollsystem ) med forskjellige byggsystemer og denne kan ogs\u00E5 brukes til mer enn bare \u00E5 bygge applikasjoner.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_nl.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_nl.properties
deleted file mode 100644
index 7d46644c79..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_nl.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=Dit is de basisfunctionaliteit van Jenkins. Bij dit type project kun je gebruik maken van een willekeurige combinatie van versiebeheer- en bouwsysteem. Je zou Jenkins zelfs kunnen gebruiken voor andere zaken dan het bouwen van software.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pl.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pl.properties
deleted file mode 100644
index 2e8e7fa70d..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pl.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=To jest podstawowa funkcja Jenkinsa. Jenkins stworzy projekt \u0142\u0105cz\u0105cy dowolny SCM z dowolnym systemem buduj\u0105cym, mo\u017Ce to by\u0107 r\u00F3wnie\u017C wykorzystane do czego\u015B innego ni\u017C budowanie oprogramowania.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_BR.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_BR.properties
deleted file mode 100644
index c02b59dfae..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_BR.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=Esta \u00e9 a central de funcionalidades do Jenkins. Ele construir\u00e1 seu projeto,e voc\u00ea pode combinar qualquer SCM com qualquer sistema de builds, e ele at\u00e9 mesmo pode ser usado para outras jobs diferentes de builds de software.
-
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_PT.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_PT.properties
deleted file mode 100644
index 769ad93de7..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_PT.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=Isto \u00E9 uma caracter\u00EDstica central do Jenkins. Jenkins vai construir o seu projecto, combinando qualquer SCM com qualquer sistema de compila\u00E7\u00E3o e isto pode ser usado mesmo em qualquer outra compila\u00E7\u00E3o de software.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ro.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ro.properties
deleted file mode 100644
index b9a2e8fb70..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ro.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=Aceasta este func\u021Bionalitatea principal\u0103 a lui Jenkins. Jenkins va construi proiectul dvs, combin\u00E2nd orice SCM cu orice sistem de build-uri, \u0219i aceasta poate fi folosit\u0103 chiar \u0219i la altceva dec\u00E2t build-uri de aplica\u021Bii.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ru.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ru.properties
deleted file mode 100644
index 18216dc92a..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_ru.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=\u042d\u0442\u043e - \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u0438 \u043d\u0430\u0438\u0431\u043e\u043b\u0435\u0435 \u0443\u043d\u0438\u0432\u0435\u0440\u0441\u0430\u043b\u044c\u043d\u044b\u0439 \u0442\u0438\u043f \u0437\u0430\u0434\u0430\u0447 \u0432 Jenkins. \
-  Jenkins \u0431\u0443\u0434\u0435\u0442 \u0441\u043e\u0431\u0438\u0440\u0430\u0442\u044c \u0432\u0430\u0448 \u043f\u0440\u043e\u0435\u043a\u0442, \u043a\u043e\u043c\u0431\u0438\u043d\u0438\u0440\u0443\u044f \u043b\u044e\u0431\u0443\u044e SCM \u0441 \u043b\u044e\u0431\u043e\u0439 \u0441\u0431\u043e\u0440\u043e\u0447\u043d\u043e\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u043e\u0439. \
-  \u0414\u0430\u043d\u043d\u044b\u0439 \u0442\u0438\u043f \u043f\u0440\u043e\u0435\u043a\u0442\u043e\u0432 \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0434\u043b\u044f \u0437\u0430\u0434\u0430\u0447, \u043e\u0442\u043b\u0438\u0447\u043d\u044b\u0445 \u043e\u0442 \u0441\u0431\u043e\u0440\u043a\u0438 \u041f\u041e.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_sv_SE.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_sv_SE.properties
deleted file mode 100644
index a1827f1712..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_sv_SE.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=Detta \u00E4r en central del i Jenkins. Jenkins kommer att bygga ditt projekt med valfri versionshanterare och med vilket byggsystem som helst, och detta kan \u00E4ven anv\u00E4ndas f\u00F6r n\u00E5got annat \u00E4n mjukvarubyggen.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_tr.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_tr.properties
deleted file mode 100644
index ad96ac4f59..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_tr.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=\
-  Jenkins''\u0131n merkezi \u00f6zelli\u011fi, projelerinizi yap\u0131land\u0131rman\u0131za yard\u0131m etmesidir. Bu proje t\u00fcr\u00fcn\u00fc kullanarak, \
-  herhangi bir yap\u0131land\u0131rma sistemini herhangi bir Kaynak Kodu Y\u00f6netimi arac\u0131 ile birle\u015ftirebilirsiniz,\
-  ve hatta yaz\u0131l\u0131m yap\u0131land\u0131rman\u0131n d\u0131\u015f\u0131nda ba\u015fka t\u00fcr projeler i\u00e7in dahi kullanabilirsiniz.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_uk.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_uk.properties
deleted file mode 100644
index 96cf935804..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_uk.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-body=\u0426\u0435 - \u043E\u0441\u043D\u043E\u0432\u043D\u0430 \u0432\u0456\u0434\u043C\u0456\u043D\u043D\u0456\u0441\u0442\u044C Jenkins. Jenkins \u043F\u043E\u0431\u0443\u0434\u0443\u0454 \u0432\u0430\u0448 \u043F\u0440\u043E\u0435\u043A\u0442, \u043A\u043E\u043C\u0431\u0456\u043D\u0443\u044E\u0447\u0438 \u0431\u0443\u0434\u044C-\u044F\u043A\u0456 \u0441\u0438\u0441\u0442\u0435\u043C\u0438 \u0443\u043F\u0440\u0430\u0432\u043B\u0456\u043D\u043D\u044F \u043A\u043E\u0434\u043E\u043C \u0437 \u0431\u0443\u0434\u044C-\u044F\u043A\u0438\u043C\u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u043C\u0438 \u0437\u0431\u0456\u0440\u043A\u0438, \u0449\u043E \u043C\u043E\u0436\u0435 \u0431\u0443\u0442\u0438 \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u043D\u043E \u043D\u0430\u0432\u0456\u0442\u044C \u0434\u043B\u044F \u0446\u0456\u043B\u0435\u0439 \u0432\u0456\u0434\u043C\u0456\u043D\u043D\u0438\u0445 \u0432\u0456\u0434 \u0437\u0431\u0456\u0440\u043A\u0438 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043D\u043E\u0433\u043E \u0437\u0430\u0431\u0435\u0437\u043F\u0435\u0447\u0435\u043D\u043D\u044F.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_zh_CN.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_zh_CN.properties
deleted file mode 100644
index 745188fb5c..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_zh_CN.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=\u8FD9\u662FJenkins\u7684\u4E3B\u8981\u529F\u80FD.Jenkins\u5C06\u4F1A\u7ED3\u5408\u4EFB\u4F55SCM\u548C\u4EFB\u4F55\u6784\u5EFA\u7CFB\u7EDF\u6765\u6784\u5EFA\u4F60\u7684\u9879\u76EE, \u751A\u81F3\u53EF\u4EE5\u6784\u5EFA\u8F6F\u4EF6\u4EE5\u5916\u7684\u7CFB\u7EDF.
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_zh_TW.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_zh_TW.properties
deleted file mode 100644
index 9f8acc78f3..0000000000
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_zh_TW.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2013, Sun Microsystems, Inc., Chunghwa Telecom Co., Ltd.,
-# and Pei-Tang Huang
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-body=\
-  \u9019\u662f Jenkins \u7684\u4e3b\u8981\u529f\u80fd\u3002\
-  Jenkins \u80fd\u642d\u914d\u5404\u5f0f\u7a0b\u5f0f\u78bc\u7ba1\u7406\u3001\u5efa\u7f6e\u7cfb\u7d71\u4f86\u5efa\u7f6e\u60a8\u7684\u5c08\u6848\uff0c\
-  \u751a\u81f3\u9084\u80fd\u505a\u8edf\u9ad4\u5efa\u7f6e\u4ee5\u5916\u7684\u5176\u4ed6\u4e8b\u60c5\u3002
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
index e389beed31..ec951a785d 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
@@ -72,7 +72,7 @@ THE SOFTWARE.
                 <th initialSortDir="up">${%Build}</th>
                 <th>${%Duration}</th>
                 <j:if test="${isMasterSlaveEnabled}">
-                  <th>${%Slave}</th>
+                  <th>${%Agent}</th>
                 </j:if>
               </tr>
             </table>
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_da.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_da.properties
index 6f69362276..f4829493c3 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_da.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_da.properties
@@ -24,6 +24,5 @@ title={0} Byggetidstrend
 Duration=Varighed
 Build\ Time\ Trend=Byggetidstrend
 Build=Byg
-Slave=Slave
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Mere end et byg er n\u00f8dvendigt for at danne en trendrapport.
 Timeline=Tidslinie
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_de.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_de.properties
index 20a7fc3a15..0466c63592 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_de.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_de.properties
@@ -23,7 +23,6 @@
 title={0} Build-Dauer Trend
 Build=Build
 Duration=Dauer
-Slave=Slave
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=F�r einen Trendbericht sind mindestens zwei Builds notwendig.
 Timeline=Zeitleiste
-Build\ Time\ Trend=Entwicklung der Build-Dauer
\ No newline at end of file
+Build\ Time\ Trend=Entwicklung der Build-Dauer
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_es.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_es.properties
index 52ed3ef570..b39198f441 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_es.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_es.properties
@@ -22,7 +22,6 @@
 
 title={0} Tendencia del tiempo de proceso
 Build=Ejecuci�n
-Slave=Esclavo
 Duration=Duraci�n
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=M�s de 1 ejecuci�n son necesarias para generar el gr�fico
 Build\ Time\ Trend=Tendencia del tiempo de ejecuci�n
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_fr.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_fr.properties
index 5d6efe0724..c5528b81b4 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_fr.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_fr.properties
@@ -25,5 +25,4 @@ title={0} Courbe de tendance de la dur\u00e9e du build
 Build=Build
 Build\ Time\ Trend=Tendance des temps de construction
 Duration=Dur\u00e9e
-Slave=Esclave
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Plus de 1 build est n\u00e9cessaire pour le rapport de tendance.
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_hu.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_hu.properties
index 4464362e1c..e5d67816dc 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_hu.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_hu.properties
@@ -3,5 +3,4 @@
 Build=\u00C9p\u00EDt\u00E9s
 Build\ Time\ Trend=\u00C9p\u00EDt\u00E9si id\u0151 tendencia
 Duration=Id\u0151
-Slave=Csom\u00F3pont
 Timeline=Id\u0151vonal
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_ja.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_ja.properties
index c147732ca4..c9cac2cdbf 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_ja.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_ja.properties
@@ -25,4 +25,3 @@ Timeline=\u30bf\u30a4\u30e0\u30e9\u30a4\u30f3
 Build=\u30d3\u30eb\u30c9
 Build\ Time\ Trend=\u30d3\u30eb\u30c9\u6642\u9593\u306e\u63a8\u79fb
 Duration=\u6240\u8981\u6642\u9593
-Slave=\u30b9\u30ec\u30fc\u30d6
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_ko.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_ko.properties
index d9b3a8e6d1..197acb7151 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_ko.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_ko.properties
@@ -24,5 +24,4 @@ Build=\uBE4C\uB4DC
 Build\ Time\ Trend=\uBE4C\uB4DC \uC18C\uC694 \uC2DC\uAC04 \uACBD\uD5A5
 Duration=\uC18C\uC694\uC2DC\uAC04
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\uACBD\uD5A5 \uBCF4\uACE0\uC11C\uB294 1\uAC1C \uC774\uC0C1\uC758 \uBE4C\uB4DC\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-Slave=Slave
 Timeline=\uD0C0\uC784\uB77C\uC778
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_lv.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_lv.properties
index df8252d96f..0685e66a16 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_lv.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_lv.properties
@@ -24,5 +24,4 @@ Build=B\u016Bv\u0113jums
 Build\ Time\ Trend=B\u016Bv\u0113jumu laika tendence
 Duration=Ilgums
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Tendences atskaitei nepiecie\u0161ams vismaz 1 b\u016Bv\u0113jums.
-Slave=Slave
 Timeline=Laika nogrieznis
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_nl.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_nl.properties
index b9bfcb6ba4..bac54ff829 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_nl.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_nl.properties
@@ -25,5 +25,4 @@ title={0} Duurtrend van een bouwpoging
 Build=Bouwpoging
 Build\ Time\ Trend=Bouw tijd trend
 Duration=Duur
-Slave=Slaaf
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Er dienen minsten 2 bouwpogingen plaatsgevonden te hebben, vooralleer een trendrapport kan opgesteld worden.
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties
index c29d10ac5b..5379d3b3c9 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties
@@ -22,7 +22,6 @@
 
 title={0} Tend\u00eancia de tempo de builds
 Duration=Dura\u00e7\u00e3o
-Slave=SlaveMore\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\u00c9 necess\u00e1rio mais do que um build para criar o relat\u00f3rio de tend\u00eancia.
 Build\ Time\ Trend=Tend\u00eancia de tempo de Build
 Timeline=Linha do tempo
 Build=Build
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_ru.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_ru.properties
index 4307789795..d7aa531f3b 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_ru.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_ru.properties
@@ -25,5 +25,4 @@ title={0} \u0413\u0440\u0430\u0444\u0438\u043a \u0432\u0440\u0435\u043c\u0435\u0
 Build=\u0421\u0431\u043e\u0440\u043a\u0430
 Build\ Time\ Trend=\u0413\u0440\u0430\u0444\u0438\u043A \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438
 Duration=\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-Slave=\u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0439
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\u0414\u043b\u044f \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u0433\u0440\u0430\u0444\u0438\u043a\u0430 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0430 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u0431\u043e\u043b\u0435\u0435 \u0447\u0435\u043c \u043e\u0434\u043d\u043e\u0439 \u0441\u0431\u043e\u0440\u043a\u0435.
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_sk.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_sk.properties
index 0f7dfd3cc5..efb2e3b01f 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_sk.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_sk.properties
@@ -3,5 +3,4 @@
 Build=Zostavenie
 Build\ Time\ Trend=Trend \u010Dasu zostavenia
 Duration=Trvanie
-Slave=Stroj
 Timeline=\u010Casov\u00E1 os
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_sv_SE.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_sv_SE.properties
index 6eeafd4ac6..90db2f4eb3 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_sv_SE.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_sv_SE.properties
@@ -23,4 +23,3 @@
 Build=Bygge
 Build\ Time\ Trend=Byggtidstrend
 Duration=Tid
-Slave=Nod
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_tr.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_tr.properties
index 2f7f9c8529..fafae7ebf8 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_tr.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_tr.properties
@@ -25,5 +25,4 @@ title={0} yap\u0131land\u0131rma zaman\u0131 e\u011filimi
 Build=Yap\u0131land\u0131rma
 Build\ Time\ Trend=\u0130n\u015Faa Zaman E\u011Filimi
 Duration=S\u00fcre
-Slave=Slave
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=E\u011filim raporu i\u00e7in birden fazla yap\u0131land\u0131rman\u0131n olmas\u0131 gerekir.
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_uk.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_uk.properties
index 89d951ea75..926e23bd1e 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_uk.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_uk.properties
@@ -3,5 +3,4 @@
 Build=\u041F\u043E\u0431\u0443\u0434\u043E\u0432\u0430
 Build\ Time\ Trend=\u0422\u0440\u0435\u043D\u0434 \u0447\u0430\u0441\u0443 \u0431\u0443\u0434\u0443\u0432\u0430\u043D\u043D\u044F
 Duration=\u0422\u0440\u0438\u0432\u0430\u043B\u0456\u0441\u0442\u044C
-Slave=\u0412\u0438\u043A\u043E\u043D\u0430\u0432\u0435\u0446\u044C
 Timeline=\u0427\u0430\u0441
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_zh_TW.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_zh_TW.properties
index 85e788544f..df0952eae5 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_zh_TW.properties
@@ -28,7 +28,6 @@ Timeline=\u6642\u9593\u8ef8
 Build\ Time\ Trend=\u5efa\u7f6e\u6642\u9593\u8da8\u52e2
 Build=\u5efa\u7f6e
 Duration=\u4f7f\u7528\u6642\u9593
-Slave=Slave
 
 More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\
   \u81f3\u5c11\u8981\u6709\u5169\u6b21\u4ee5\u4e0a\u7684\u5efa\u7f6e\u8a18\u9304\u624d\u80fd\u7522\u51fa\u8da8\u52e2\u5831\u544a\u3002
diff --git a/core/src/main/resources/hudson/model/Job/configure.jelly b/core/src/main/resources/hudson/model/Job/configure.jelly
index ec2a5b6839..81c7e86031 100644
--- a/core/src/main/resources/hudson/model/Job/configure.jelly
+++ b/core/src/main/resources/hudson/model/Job/configure.jelly
@@ -27,12 +27,13 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <l:layout title="${it.displayName} Config" norefresh="true" permission="${it.EXTENDED_READ}">
-    <st:include page="sidepanel.jelly" />
-    <f:breadcrumb-config-outline />
+  <l:layout title="${it.displayName} Config" cssclass="main-panel-only" norefresh="true" permission="${it.EXTENDED_READ}">
     <l:main-panel>
+      <l:js src="jsbundles/config-scrollspy.js" />
+      <l:css src="jsbundles/config-scrollspy.css" />
+
       <div class="behavior-loading">${%LOADING}</div>
-      <f:form method="post" action="configSubmit" name="config">
+      <f:form method="post" action="configSubmit" name="config" tableClass="config-table scrollspy">
         <j:set var="descriptor" value="${it.descriptor}" />
         <j:set var="instance" value="${it}" />
 
@@ -54,7 +55,7 @@ THE SOFTWARE.
           <f:bottomButtonBar>
             <!--<input type="button" name="StructureTest" value="Test" onclick="buildFormTree(this.form)" />-->
             <f:submit value="${%Save}"/>
-            <f:apply />
+            <f:apply value="${%Apply}"/>
           </f:bottomButtonBar>
         </j:if>
       </f:form>
diff --git a/core/src/main/resources/hudson/model/Job/configure.properties b/core/src/main/resources/hudson/model/Job/configure.properties
index f6f01a21a9..ba7d95bb98 100644
--- a/core/src/main/resources/hudson/model/Job/configure.properties
+++ b/core/src/main/resources/hudson/model/Job/configure.properties
@@ -20,4 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-name={0} name
\ No newline at end of file
+name={0} name
+Save=Save
+Apply=Apply
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Label/sidepanel.jelly b/core/src/main/resources/hudson/model/Label/sidepanel.jelly
index 734a5c53dd..7d662a0a45 100644
--- a/core/src/main/resources/hudson/model/Label/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/Label/sidepanel.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
       <l:task contextMenu="false" href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
       <l:task contextMenu="false" href="${url}" icon="icon-attribute icon-md" title="${%Overview}"/>
       <j:if test="${it.atom}">
-        <l:task href="${url}/configure" icon="icon-setting icon-md" title="${%Configure}" permission="${app.ADMINISTER}" />
+        <l:task href="${url}/configure" icon="icon-gear2 icon-md" title="${%Configure}" permission="${app.ADMINISTER}" />
       </j:if>
       <l:task href="${url}/load-statistics" icon="icon-monitor icon-md" title="${%Load Statistics}"/>
       <st:include page="actions.jelly" />
diff --git a/core/src/main/resources/hudson/model/LoadStatistics/main.properties b/core/src/main/resources/hudson/model/LoadStatistics/main.properties
index 9fc34ab657..f8e8787faf 100644
--- a/core/src/main/resources/hudson/model/LoadStatistics/main.properties
+++ b/core/src/main/resources/hudson/model/LoadStatistics/main.properties
@@ -31,7 +31,7 @@ blurb=\
       For a label: this is the sum of all executors across all online computers in this label. <br />\
       For the entire Jenkins: this is the sum of all executors across all online computers in this Jenkins \
       installation. <br /> \
-      Other than configuration changes, this value can also change when slaves go offline. \
+      Other than configuration changes, this value can also change when agents go offline. \
     </dd> \
     <dt>Number of busy executors</dt> \
     <dd>\
diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index 571ec8867f..32730a733d 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -31,7 +31,7 @@ AbstractBuild.KeptBecause=This build is kept because of {0}.
 AbstractItem.NoSuchJobExists=No such job \u2018{0}\u2019 exists. Perhaps you meant \u2018{1}\u2019?
 AbstractItem.NoSuchJobExistsWithoutSuggestion=No such job \u2018{0}\u2019 exists.
 AbstractItem.Pronoun=Item
-AbstractProject.AssignedLabelString_NoMatch_DidYouMean=There\u2019s no slave/cloud that matches this assignment. Did you mean \u2018{1}\u2019 instead of \u2018{0}\u2019?
+AbstractProject.AssignedLabelString_NoMatch_DidYouMean=There\u2019s no agent/cloud that matches this assignment. Did you mean \u2018{1}\u2019 instead of \u2018{0}\u2019?
 AbstractProject.NewBuildForWorkspace=Scheduling a new build to get a workspace.
 AbstractProject.AwaitingBuildForWorkspace=Awaiting build to get a workspace.
 AbstractProject.AwaitingWorkspaceToComeOnline=We need to schedule a new build to get a workspace, but deferring {0}ms in the hope that one will become available soon
@@ -72,7 +72,7 @@ AbstractProject.CancelPermission.Description=\
 AbstractProject.AssignedLabelString.InvalidBooleanExpression=\
   Invalid boolean expression: {0}
 AbstractProject.AssignedLabelString.NoMatch=\
-  There's no slave/cloud that matches this assignment
+  There's no agent/cloud that matches this assignment
 AbstractProject.CustomWorkspaceEmpty=Custom workspace is empty.
 AbstractProject.LabelLink=<a href="{0}{1}">Label</a> is serviced by {2,choice,0#no nodes|1#1 node|1<{2} nodes}{3,choice,0#|1# and 1 cloud|1< and {3} clouds}
 
@@ -99,21 +99,21 @@ CLI.offline-node.shortDescription=Stop using a node for performing builds tempor
 CLI.wait-node-online.shortDescription=Wait for a node to become online.
 CLI.wait-node-offline.shortDescription=Wait for a node to become offline.
 
-Computer.Caption=Slave {0}
-Computer.NoSuchSlaveExists=No such slave "{0}" exists. Did you mean "{1}"?
-Computer.Permissions.Title=Slave
-Computer.ExtendedReadPermission.Description=This permission allows users to read slave configuration.
-Computer.ConfigurePermission.Description=This permission allows users to configure slaves.
-Computer.DeletePermission.Description=This permission allows users to delete existing slaves.
-Computer.CreatePermission.Description=This permission allows users to create slaves.
-Computer.ConnectPermission.Description=This permission allows users to connect slaves or mark slaves as online.
-Computer.DisconnectPermission.Description=This permission allows users to disconnect slaves or mark slaves as temporarily offline.
-Computer.BuildPermission.Description=This permission allows users to run jobs as them on slaves.
-Computer.BadChannel=Slave node offline or not a remote channel (such as master node).
+Computer.Caption=Agent {0}
+Computer.NoSuchSlaveExists=No such agent "{0}" exists. Did you mean "{1}"?
+Computer.Permissions.Title=Agent
+Computer.ExtendedReadPermission.Description=This permission allows users to read agent configuration.
+Computer.ConfigurePermission.Description=This permission allows users to configure agents.
+Computer.DeletePermission.Description=This permission allows users to delete existing agents.
+Computer.CreatePermission.Description=This permission allows users to create agents.
+Computer.ConnectPermission.Description=This permission allows users to connect agents or mark agents as online.
+Computer.DisconnectPermission.Description=This permission allows users to disconnect agents or mark agents as temporarily offline.
+Computer.BuildPermission.Description=This permission allows users to run jobs as them on agents.
+Computer.BadChannel=Agent node offline or not a remote channel (such as master node).
 
-ComputerSet.NoSuchSlave=No such slave: {0}
-ComputerSet.SlaveAlreadyExists=Slave called \u2018{0}\u2019 already exists
-ComputerSet.SpecifySlaveToCopy=Specify which slave to copy
+ComputerSet.NoSuchSlave=No such agent: {0}
+ComputerSet.SlaveAlreadyExists=Agent called \u2018{0}\u2019 already exists
+ComputerSet.SpecifySlaveToCopy=Specify which agent to copy
 ComputerSet.DisplayName=Nodes
 
 Descriptor.From=(from <a href="{1}">{0}</a>)
@@ -121,6 +121,9 @@ Descriptor.From=(from <a href="{1}">{0}</a>)
 Executor.NotAvailable=N/A
 
 FreeStyleProject.DisplayName=Freestyle project
+FreeStyleProject.Description=\
+  This is the central feature of Jenkins. Jenkins will build your project, combining any SCM with any build system, \
+  and this can be even used for something other than software build.
 
 HealthReport.EmptyString=
 
@@ -232,19 +235,19 @@ Run.Summary.BrokenSinceThisBuild=broken since this build
 Run.Summary.BrokenSince=broken since build {0}
 Run.Summary.Unknown=?
 
-Slave.InvalidConfig.Executors=Invalid slave configuration for {0}. Invalid # of executors.
-Slave.InvalidConfig.NoName=Invalid slave configuration. Name is empty
-Slave.InvalidConfig.NoRemoteDir=Invalid slave configuration for {0}. No remote directory given
-Slave.Launching={0} Launching slave agent
+Slave.InvalidConfig.Executors=Invalid agent configuration for {0}. Invalid # of executors.
+Slave.InvalidConfig.NoName=Invalid agent configuration. Name is empty
+Slave.InvalidConfig.NoRemoteDir=Invalid agent configuration for {0}. No remote directory given
+Slave.Launching={0} Launching agent
 Slave.Network.Mounted.File.System.Warning=Are you sure you want to use network mounted file system for FS root? Note that this directory does not need to be visible to the master.
 Slave.Remote.Director.Mandatory=Remote directory is mandatory
-Slave.Terminated={0} slave agent was terminated
+Slave.Terminated={0} agent was terminated
 Slave.Remote.Relative.Path.Warning=Are you sure you want to use a relative path for the FS root? Note that relative \
   paths require that you can assure that the selected launcher provides a consistent current working directory. Using \
   an absolute path is highly recommended.
-Slave.UnableToLaunch=Unable to launch the slave agent for {0}{1}
-Slave.UnixSlave=This is a Unix slave
-Slave.WindowsSlave=This is a Windows slave
+Slave.UnableToLaunch=Unable to launch the agent for {0}{1}
+Slave.UnixSlave=This is a Unix agent
+Slave.WindowsSlave=This is a Windows agent
 
 TopLevelItemDescriptor.NotApplicableIn={0} items are not applicable within {1}
 
@@ -300,7 +303,7 @@ UpdateCenter.PluginCategory.scala=Scala Development
 UpdateCenter.PluginCategory.scm=Source Code Management
 UpdateCenter.PluginCategory.scm-related=Source Code Management related
 UpdateCenter.PluginCategory.security=Security
-UpdateCenter.PluginCategory.slaves=Slave Launchers and Controllers
+UpdateCenter.PluginCategory.slaves=Agent Launchers and Controllers
 UpdateCenter.PluginCategory.test=Testing
 UpdateCenter.PluginCategory.trigger=Build Triggers
 UpdateCenter.PluginCategory.ui=User Interface
@@ -319,9 +322,9 @@ Permalink.LastFailedBuild=Last failed build
 Permalink.LastCompletedBuild=Last completed build
 
 ParameterAction.DisplayName=Parameters
-ParametersDefinitionProperty.DisplayName=This build is parameterized
+ParametersDefinitionProperty.DisplayName=This project is parameterized
 StringParameterDefinition.DisplayName=String Parameter
-TextParameterDefinition.DisplayName=Text Parameter
+TextParameterDefinition.DisplayName=Multi-line String Parameter
 FileParameterDefinition.DisplayName=File Parameter
 BooleanParameterDefinition.DisplayName=Boolean Parameter
 ChoiceParameterDefinition.DisplayName=Choice Parameter
@@ -333,8 +336,8 @@ Node.BecauseNodeIsReserved={0} is reserved for jobs with matching label expressi
 Node.BecauseNodeIsNotAcceptingTasks={0} is not accepting tasks
 Node.LabelMissing={0} doesn\u2019t have label {1}
 Node.LackingBuildPermission={0} doesn\u2019t have a permission to run on {1}
-Node.Mode.NORMAL=Utilize this node as much as possible
-Node.Mode.EXCLUSIVE=Only build jobs with label restrictions matching this node
+Node.Mode.NORMAL=Use this node as much as possible
+Node.Mode.EXCLUSIVE=Only build jobs with label expressions matching this node
 
 ListView.DisplayName=List View
 
diff --git a/core/src/main/resources/hudson/model/Messages_ar.properties b/core/src/main/resources/hudson/model/Messages_ar.properties
new file mode 100644
index 0000000000..6ff7b6edcf
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_ar.properties
@@ -0,0 +1 @@
+FreeStyleProject.Description=\u0647\u0630\u0647 \u0647\u064A \u0627\u0644\u0645\u064A\u0632\u0629 \u0627\u0644\u0631\u0626\u064A\u0633\u064A\u0629 \u0641\u064A \u062C\u0646\u0643\u0646\u0632. \u062C\u0646\u0643\u0646\u0632 \u0633\u064A\u0628\u0646\u064A \u0644\u0643 \u0645\u0634\u0631\u0648\u0639\u0643\u060C \u064A\u0633\u062A\u062E\u062F\u0645 \u0623\u062F\u0648\u0627\u062A \u0645\u0631\u0627\u0642\u0628\u0629 \u0627\u0644\u0645\u0635\u062F\u0631 \u0627\u0644\u0628\u0631\u0645\u062C\u064A\u060C \u0648\u064A\u0645\u0643\u0646 \u062D\u062A\u0649 \u0627\u0633\u062A\u062E\u062F\u0627\u0645\u0647\u0627 \uFEF7\u0634\u064A\u0627\u0621 \u063A\u064A\u0631 \u0628\u0646\u0627\u0621 \u0627\u0644\u0645\u0634\u0631\u0648\u0639.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Messages_bg.properties b/core/src/main/resources/hudson/model/Messages_bg.properties
index fad7cc6409..7bfa610ffd 100644
--- a/core/src/main/resources/hudson/model/Messages_bg.properties
+++ b/core/src/main/resources/hudson/model/Messages_bg.properties
@@ -37,8 +37,6 @@ AbstractItem.NoSuchJobExistsWithoutSuggestion=\
  \u041d\u0435 \u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430 \u0437\u0430\u0434\u0430\u0447\u0430 \u043d\u0430 \u0438\u043c\u0435 \u201e{0}\u201c.
 AbstractItem.Pronoun=\
  \u0415\u043b\u0435\u043c\u0435\u043d\u0442
-AbstractProject.AssignedLabelString_NoMatch_DidYouMean=\
- \u041d\u0438\u043a\u043e\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u0430 \u043d\u0435 \u043e\u0442\u0433\u043e\u0432\u0430\u0440\u044f \u0437\u0430 \u0442\u0430\u0437\u0438 \u0437\u0430\u0434\u0430\u0447\u0430. \u0414\u0430 \u043d\u044f\u043c\u0430\u0442\u0435 \u043f\u0440\u0435\u0434\u0432\u0438\u0434 \u201e{1}\u201c \u0432\u043c\u0435\u0441\u0442\u043e \u201e{0}\u201c?
 AbstractProject.NewBuildForWorkspace=\
  \u041d\u0430\u0441\u0440\u043e\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u043e\u0432\u043e \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435, \u0437\u0430 \u0434\u0430 \u0441\u0435 \u043f\u043e\u043b\u0443\u0447\u0438 \u0440\u0430\u0431\u043e\u0442\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e.
 AbstractProject.AwaitingBuildForWorkspace=\
@@ -105,8 +103,6 @@ AbstractProject.CancelPermission.Description=\
  \u0422\u043e\u0432\u0430 \u0434\u0430\u0432\u0430 \u043f\u0440\u0430\u0432\u043e \u0437\u0430 \u043e\u0442\u043c\u044f\u043d\u0430 \u043d\u0430 \u0437\u0430\u043f\u043b\u0430\u043d\u0443\u0432\u0430\u043d\u043e \u0438 \u0441\u043f\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0438\u0437\u043f\u044a\u043b\u043d\u044f\u0432\u0430\u043d\u043e \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435.
 AbstractProject.AssignedLabelString.InvalidBooleanExpression=\
  \u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u0435\u043d \u0431\u0443\u043b\u0435\u0432 \u0438\u0437\u0440\u0430\u0437: {0}
-AbstractProject.AssignedLabelString.NoMatch=\
- \u041d\u0438\u043a\u043e\u044f \u043c\u0430\u0448\u0438\u043d\u0430 \u0438\u043b\u0438 \u043e\u0431\u043b\u0430\u043a \u043d\u0435 \u043e\u0442\u0433\u043e\u0432\u0430\u0440\u044f \u043d\u0430 \u0442\u0430\u0437\u0438 \u0437\u0430\u0434\u0430\u0447\u0430.
 AbstractProject.CustomWorkspaceEmpty=\
  \u041f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0441\u043a\u043e\u0442\u043e \u0440\u0430\u0431\u043e\u0442\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e \u0435 \u043f\u0440\u0430\u0437\u043d\u043e.
 AbstractProject.LabelLink=\
@@ -164,38 +160,6 @@ CLI.wait-node-online.shortDescription=\
 CLI.wait-node-offline.shortDescription=\
  \u0418\u0437\u0447\u0430\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043c\u0430\u0448\u0438\u043d\u0430 \u0434\u0430 \u043d\u0435 \u0435 \u043d\u0430 \u043b\u0438\u043d\u0438\u044f.
 
-Computer.Caption=\
- \u041a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u201e{0}\u201c
-Computer.NoSuchSlaveExists=\
- \u041d\u0435 \u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u201e{0}\u201c. \u201e{1}\u201c \u043b\u0438 \u0438\u043c\u0430\u0442\u0435 \u043f\u0440\u0435\u0434\u0432\u0438\u0434?
-Computer.Permissions.Title=\
- \u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440
-Computer.ExtendedReadPermission.Description=\
- \u0422\u043e\u0432\u0430 \u0434\u0430\u0432\u0430 \u043f\u0440\u0430\u0432\u043e \u0437\u0430 \u0434\u043e\u0441\u0442\u044a\u043f \u0437\u0430 \u0447\u0435\u0442\u0435\u043d\u0435 \u0434\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0442\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u0442\u0435 \u043a\u043e\u043c\u043f\u044e\u0442\u0440\u0438.
-Computer.ConfigurePermission.Description=\
- \u0422\u043e\u0432\u0430 \u0434\u0430\u0432\u0430 \u043f\u0440\u0430\u0432\u043e \u0437\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u0432\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438 \u043a\u043e\u043c\u043f\u044e\u0442\u0440\u0438.
-Computer.DeletePermission.Description=\
- \u0422\u043e\u0432\u0430 \u0434\u0430\u0432\u0430 \u043f\u0440\u0430\u0432\u043e \u0437\u0430 \u043c\u0430\u0445\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438 \u043a\u043e\u043c\u043f\u044e\u0442\u0440\u0438.
-Computer.CreatePermission.Description=\
- \u0422\u043e\u0432\u0430 \u0434\u0430\u0432\u0430 \u043f\u0440\u0430\u0432\u043e \u0437\u0430 \u0434\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438 \u043a\u043e\u043c\u043f\u044e\u0442\u0440\u0438.
-Computer.ConnectPermission.Description=\
- \u0422\u043e\u0432\u0430 \u0434\u0430\u0432\u0430 \u043f\u0440\u0430\u0432\u043e \u0437\u0430 \u0434\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438 \u043a\u043e\u043c\u043f\u044e\u0442\u0440\u0438 \u0438 \u043e\u0431\u044f\u0432\u044f\u0432\u0430\u043d\u0435\u0442\u043e \u0438\u043c, \u0447\u0435 \u0441\u0430 \u043d\u0430\
- \u043b\u0438\u043d\u0438\u044f.
-Computer.DisconnectPermission.Description=\
- \u0422\u043e\u0432\u0430 \u0434\u0430\u0432\u0430 \u043f\u0440\u0430\u0432\u043e \u0437\u0430 \u043c\u0430\u0445\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438 \u043a\u043e\u043c\u043f\u044e\u0442\u0440\u0438 \u0438 \u043e\u0431\u044f\u0432\u044f\u0432\u0430\u043d\u0435\u0442\u043e \u0438\u043c, \u0447\u0435 \u043d\u0435 \u0441\u0430 \u043d\u0430\
- \u043b\u0438\u043d\u0438\u044f.
-Computer.BuildPermission.Description=\
- \u0422\u043e\u0432\u0430 \u0434\u0430\u0432\u0430 \u043f\u0440\u0430\u0432\u043e \u043d\u0430 \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0438\u0442\u0435 \u0434\u0430 \u0438\u0437\u043f\u044a\u043b\u043d\u044f\u0432\u0430\u0442 \u0437\u0430\u0434\u0430\u0447\u0438 \u043e\u0442 \u0441\u0432\u043e\u0435 \u0438\u043c\u0435 \u043d\u0430\
- \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u0442\u0435 \u043a\u043e\u043c\u043f\u044e\u0442\u0440\u0438.
-Computer.BadChannel=\
- \u0410\u043a\u043e \u0442\u043e\u0432\u0430 \u0435 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440, \u0442\u043e\u0439 \u043d\u0435 \u0435 \u043d\u0430 \u043b\u0438\u043d\u0438\u044f.
-
-ComputerSet.NoSuchSlave=\
- \u041d\u044f\u043c\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u043d\u0430 \u0438\u043c\u0435 \u201e{0}\u201c.
-ComputerSet.SlaveAlreadyExists=\
- \u0412\u0435\u0447\u0435 \u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u043d\u0430 \u0438\u043c\u0435 \u201e{0}\u201c.
-ComputerSet.SpecifySlaveToCopy=\
- \u0412\u044a\u0432\u0435\u0434\u0435\u0442\u0435 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435
 ComputerSet.DisplayName=\
  \u041a\u043e\u043c\u043f\u044e\u0442\u0440\u0438
 
@@ -207,6 +171,8 @@ Executor.NotAvailable=\
 
 FreeStyleProject.DisplayName=\
  \u041f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0441\u043a\u0430 \u0437\u0430\u0434\u0430\u0447\u0430
+FreeStyleProject.Description=\
+ \u0422\u043E\u0432\u0430 \u0435 \u043E\u0441\u043D\u043E\u0432\u043D\u0430 \u0444\u0443\u043D\u043A\u0446\u0438\u043E\u043D\u0430\u043B\u043D\u043E\u0441\u0442 \u0432 Jenkins. Jenkins \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u0438\u043B\u0434\u043D\u0435 \u0432\u0430\u0448 \u043F\u0440\u043E\u0435\u043A\u0442 \u043A\u043E\u043C\u0431\u0438\u043D\u0438\u0440\u0430\u0439\u043A\u0438 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u043B\u0435\u043D \u0441\u043E\u0440\u0441 \u043A\u043E\u043D\u0442\u0440\u043E\u043B \u0441 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u043B\u043D\u0430 \u0431\u0438\u043B\u0434 \u0441\u0438\u0441\u0442\u0435\u043C\u0430, \u043A\u0430\u0442\u043E \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0440\u0438 \u0434\u0430 \u0433\u043E \u043F\u043E\u043B\u0437\u0432\u0430\u0442\u0435 \u0438 \u0437\u0430 \u0434\u0440\u0443\u0433\u0438 \u0446\u0435\u043B\u0438 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u0438 \u043E\u0442 \u0431\u0438\u043B\u0434\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u043E\u0444\u0442\u0443\u0435\u0440.
 
 HealthReport.EmptyString=
 
@@ -403,33 +369,16 @@ Run.Summary.BrokenSince=\
 Run.Summary.Unknown=\
  \u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u043e
 
-Slave.InvalidConfig.Executors=\
- \u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u043d\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u201e{0}\u201c \u2014 \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u0435\u043d \u0431\u0440\u043e\u0439 \u043d\u0430\
- \u0438\u0437\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b\u0438\u0442\u0435.
-Slave.InvalidConfig.NoName=\
- \u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u043d\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u2014 \u0438\u043c\u0435\u0442\u043e \u0435 \u043f\u0440\u0430\u0437\u043d\u043e.
-Slave.InvalidConfig.NoRemoteDir=\
- \u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u043d\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u201e{0}\u201c \u2014 \u043b\u0438\u043f\u0441\u0432\u0430 \u043e\u0442\u0434\u0430\u043b\u0435\u0447\u0435\u043d\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f.
-Slave.Launching=\
- {0} \u2014 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043f\u0440\u043e\u0446\u0435\u0441
 Slave.Network.Mounted.File.System.Warning=\
  \u0421\u0438\u0433\u0443\u0440\u043d\u0438 \u043b\u0438 \u0441\u0442\u0435, \u0447\u0435 \u0438\u0441\u043a\u0430\u0442\u0435 \u0441\u0430 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442\u0435 \u0444\u0430\u0439\u043b\u043e\u0432\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u0430, \u043c\u043e\u043d\u0442\u0438\u0440\u0430\u043d\u0430 \u043f\u043e\
  \u043c\u0440\u0435\u0436\u0430\u0442\u0430, \u043a\u0430\u0442\u043e \u043a\u043e\u0440\u0435\u043d\u043e\u0432\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f? \u041d\u044f\u043c\u0430 \u043d\u0443\u0436\u0434\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f\u0442\u0430 \u0434\u0430 \u0441\u0435 \u0432\u0438\u0436\u0434\u0430 \u043e\u0442\
  \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0432\u0430\u0449\u0438\u044f \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440.
 Slave.Remote.Director.Mandatory=\
  \u041e\u0442\u0434\u0430\u043b\u0435\u0447\u0435\u043d\u0430\u0442\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f \u0435 \u0437\u0430\u0434\u044a\u043b\u0436\u0438\u0442\u0435\u043b\u043d\u0430.
-Slave.Terminated=\
- {0} \u2014 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u044f\u0442 \u043f\u0440\u043e\u0446\u0435\u0441 \u0431\u0435 \u043f\u0440\u0435\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0435\u043d
 Slave.Remote.Relative.Path.Warning=\
  \u0421\u0438\u0433\u0443\u0440\u043d\u0438 \u043b\u0438 \u0441\u0442\u0435, \u0447\u0435 \u0438\u0441\u043a\u0430\u0442\u0435 \u0441\u0430 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442\u0435 \u043e\u0442\u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435\u043d \u043f\u044a\u0442 \u043a\u0430\u0442\u043e \u043a\u043e\u0440\u0435\u043d\u043e\u0432\u0430\
  \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f? \u041f\u0440\u043e\u0432\u0435\u0440\u0435\u0442\u0435 \u0434\u0430\u043b\u0438 \u0438\u0437\u0431\u0440\u0430\u043d\u0438\u044f\u0442 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0449 \u043f\u0440\u043e\u0446\u0435\u0441 \u043e\u0441\u0438\u0433\u0443\u0440\u044f\u0432\u0430 \u043a\u043e\u043d\u0441\u0438\u0441\u0442\u0435\u043d\u0442\u043d\u043e\u0441\u0442\
  \u043d\u0430 \u0442\u0435\u043a\u0443\u0449\u0430\u0442\u0430 \u0440\u0430\u0431\u043e\u0442\u043d\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f. \u041f\u0440\u0435\u043f\u043e\u0440\u044a\u0447\u0438\u0442\u0435\u043b\u043d\u043e \u0435 \u0434\u0430 \u043f\u043e\u043b\u0437\u0432\u0430\u0442\u0435 \u0430\u0431\u0441\u043e\u043b\u044e\u0442\u0435\u043d \u043f\u044a\u0442.
-Slave.UnableToLaunch=\
- \u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043f\u0440\u043e\u0446\u0435\u0441 \u0437\u0430 \u201e{0}{1}\u201c
-Slave.UnixSlave=\
- \u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u0441 Unix.
-Slave.WindowsSlave=\
- \u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u0441 Windows.
 
 TopLevelItemDescriptor.NotApplicableIn=\
  {0} \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0430 \u043d\u0435 \u043c\u043e\u0433\u0430\u0442 \u0434\u0430 \u0441\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0430\u0442 \u0432 {1}
@@ -525,8 +474,6 @@ UpdateCenter.PluginCategory.scm-related=\
  \u041e\u0449\u0435 \u0437\u0430 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0442\u043e \u043d\u0430 \u0432\u0435\u0440\u0441\u0438\u0438\u0442\u0435
 UpdateCenter.PluginCategory.security=\
  \u0421\u0438\u0433\u0443\u0440\u043d\u043e\u0441\u0442
-UpdateCenter.PluginCategory.slaves=\
- \u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u0442\u0435 \u0438\u0437\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b\u0438 \u043d\u0430 \u0437\u0430\u0434\u0430\u0447\u0438
 UpdateCenter.PluginCategory.test=\
  \u0422\u0435\u0441\u0442\u0432\u0430\u043d\u0435
 UpdateCenter.PluginCategory.trigger=\
diff --git a/core/src/main/resources/hudson/model/Messages_ca.properties b/core/src/main/resources/hudson/model/Messages_ca.properties
index 2237bbee1d..0a5f3a512e 100644
--- a/core/src/main/resources/hudson/model/Messages_ca.properties
+++ b/core/src/main/resources/hudson/model/Messages_ca.properties
@@ -1 +1,3 @@
 ManageJenkinsAction.DisplayName=Configuraci\u00F3 de Jenkins
+
+FreeStyleProject.Description=Aquesta \u00E9s la funcionalitat principal de Jenkins. Jenkins far\u00E0 un build del vostre projecte combinant qualsevol SCM amb qualsevol sistema de build. Aix\u00F2 tamb\u00E9 es pot usar per tasques que no siguin un build de software
diff --git a/core/src/main/resources/hudson/model/Messages_cs.properties b/core/src/main/resources/hudson/model/Messages_cs.properties
index c294dbd242..11de8e6c7a 100644
--- a/core/src/main/resources/hudson/model/Messages_cs.properties
+++ b/core/src/main/resources/hudson/model/Messages_cs.properties
@@ -1 +1,3 @@
 ManageJenkinsAction.DisplayName=Administrace
+
+FreeStyleProject.Description=Toto je hlavn\u00ED funkce Jenkins. Jenkins sestav\u00ED v\u00E1\u0161 projekt, spoj\u00ED jak\u00FDkoli syst\u00E9m pro spr\u00E1vu verz\u00ED se syst\u00E9mem pro sestaven\u00ED. Nemus\u00ED b\u00FDt pou\u017Eit jen pro sestaven\u00ED softwaru.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Messages_da.properties b/core/src/main/resources/hudson/model/Messages_da.properties
index 76378ed018..427ba244f1 100644
--- a/core/src/main/resources/hudson/model/Messages_da.properties
+++ b/core/src/main/resources/hudson/model/Messages_da.properties
@@ -38,7 +38,6 @@ Denne tilladelse g\u00f8r det muligt for brugeren at opdatere beskrivelsen og an
 for eksempel for at skrive en besked om hvorfor et byg fejler.
 StringParameterDefinition.DisplayName=Strengparameter
 Node.Mode.NORMAL=Benyt denne slave s\u00e5 meget som overhovedet muligt
-Computer.Caption=Slave {0}
 ProxyView.NoSuchViewExists=Global visning {0} findes ikke
 UpdateCenter.PluginCategory.external=Eksternt site/ v\u00e6rkt\u00f8jsintegration
 BallColor.Pending=I k\u00f8
@@ -60,18 +59,18 @@ Run.DeletePermission.Description=Denne tilladelse g\u00f8r det muligt for bruger
 Run.Summary.BrokenForALongTime=fejlet l\u00e6nge
 CLI.safe-restart.shortDescription=Sikker genstart af Jenkins
 CLI.quiet-down.shortDescription=Forbereder nedlukning, starter ingen nye byg.
+
 FreeStyleProject.DisplayName=Byg et free-style projekt
+FreeStyleProject.Description=Dette er den centrale feature i Jenkins. Jenkins vil bygge dit projekt i enhver kombination af kildekodestyring (SCM) med ethvert byggesystem og dette kan bruges til meget andet end at bygge software.
+
 ProxyView.DisplayName=Inkluder en global visning
-ComputerSet.SpecifySlaveToCopy=Angiv hvilken slave der skal kopieres
 Run.Permissions.Title=K\u00f8r
 Hudson.DisplayName=Jenkins
 Hudson.NotANonNegativeNumber=V\u00e6rdien m\u00e5 ikke v\u00e6re negativ
-Slave.Launching={0} Starter slave agent
 BallColor.InProgress=I gang
 AbstractProject.NoBuilds=Ingen eksisterende byg. Skedulerer et nyt.
 Run.BuildAborted=Byg afbrudt
 BallColor.Aborted=Afbrudt
-Slave.InvalidConfig.NoRemoteDir=Ugyldig slavekonfiguration for {0}. Intet fjerndirektorie angivet.
 ListView.DisplayName=Listevisning
 UpdateCenter.PluginCategory.page-decorator=Sidedekorat\u00f8rer
 Cause.LegacyCodeCause.ShortDescription=Legacy kode startede dette job. Ingen startbegrundelse tilg\u00e6ngelig.
@@ -80,15 +79,11 @@ UpdateCenter.PluginCategory.post-build=Andre postbyg handlinger
 Cause.UpstreamCause.ShortDescription=Startet af upstreamprojektet "{0}" byg nummer {1}
 UpdateCenter.PluginCategory.cli=Kommandolinieinterface
 UpdateCenter.PluginCategory.builder=Byggev\u00e6rkt\u00f8jer
-Slave.UnixSlave=Dette er en Unix slave
 FileParameterDefinition.DisplayName=Filparametre
 Run.Summary.Unstable=Ustabil
 CLI.reload-configuration.shortDescription=Genindl\u00e6s alle data fra filsystemet. \
 Nyttigt hvis du har modificeret konfigurationsfiler direkte, udenom Jenkins.
-ComputerSet.NoSuchSlave=Ingen slave ved navn: {0}
-ComputerSet.SlaveAlreadyExists=En slave ved navn ''{0}'' eksisterer allerede
 Executor.NotAvailable=N/A
-Slave.Terminated={0} slave agenten blev tilintetgjort
 Item.Permissions.Title=Job
 AbstractProject.NoWorkspace=Intet arbejdsomr\u00e5de tilg\u00e6ngeligt, kan ikke checke for opdateringer.
 CLI.disable-job.shortDescription=Sl\u00e5r et job fra
@@ -109,7 +104,6 @@ MyView.DisplayName=Min visning
 Hudson.USER_CONTENT_README=Filer i dette direktorie vil blive serveret under http://server/hudson/userContent/
 UpdateCenter.PluginCategory.scm-related=Kildekodestyring (SCM) relateret
 CLI.cancel-quiet-down.shortDescription=Sl\u00e5 effekten af "quite-down" kommandoen fra.
-Slave.InvalidConfig.Executors=Ugyldig slavekonfiguration for {0}. Ugyldigt # afviklere.
 Api.NoXPathMatch=XPath {0} matcher ikke
 Run.MarkedExplicitly=Eksplicit markeret til at blive gemt
 Hudson.Permissions.Title=Overordnet
@@ -117,7 +111,6 @@ AbstractProject.UpstreamBuildInProgress=Upstreamprojektet {0} bygger allerede.
 Permalink.LastBuild=Seneste Byg
 MyViewsProperty.ViewExistsCheck.NotExist=En visning ved navn {0} findes ikke
 AbstractItem.NoSuchJobExists=Intet job ved navn ''{0}'' eksisterer. M\u00e5ske mener du ''{1}''?
-Slave.InvalidConfig.NoName=Ugyldig slavekonfiguration. Navnet er tomt.
 Run.Summary.BackToNormal=tilbage p\u00e5 sporet
 BooleanParameterDefinition.DisplayName=Boolesk V\u00e6rdi
 Permalink.LastSuccessfulBuild=Seneste succesfulde byg
@@ -135,7 +128,6 @@ UpdateCenter.PluginCategory.notifier=Bygge Notifikatorer
 Label.ProvisionedFrom=Provisioneret fra {0}
 Run.Summary.Aborted=afbrudt
 UpdateCenter.PluginCategory.report=Bygge Rapporter
-Computer.ConfigurePermission.Description=Denne rettighed tillader brugere at konfigurere slaver.
 View.Permissions.Title=Visninger
 Permalink.LastFailedBuild=Seneste fejlede byg
 UpdateCenter.PluginCategory.scm=Kildekodestyring (SCM)
@@ -151,12 +143,10 @@ UpdateCenter.PluginCategory.cluster=Klyngestyring og distribuerede byg
 AbstractBuild.KeptBecause=beholdt pga. {0}
 Hudson.NotADirectory={0} er ikke et direktorie
 Cause.RemoteCause.ShortDescription=Startet af fjernv\u00e6rt {0}
-Slave.WindowsSlave=Dette er en Windows slave
 Run.ArtifactsPermission.Description=\
 Denne rettighed g\u00f8r det muligt at hente byggeartifakter. \
 Hvis du ikke vil have at en bruger skal kunne tilg\u00e5 byggeartifakter kan \
 du fratage vedkommende denne rettighed.
-Computer.BadChannel=Slave node offline eller ikke en fjernkanal (f.eks. en masternode).
 AbstractProject.Aborted=Afbrudt
 Queue.init=Genopretter byggek\u00f8en
 Hudson.NodeDescription=master Jenkins noden
@@ -176,10 +166,8 @@ s\u00e5vel som at k\u00f8re yderst f\u00f8lsomme operationer der effektivt svare
 Hudson.NotJDKDir={0} ligner ikke et JDK direktorie
 AbstractProject.WorkspaceOffline=Arbejdsomr\u00e5det er offline.
 Queue.HudsonIsAboutToShutDown=Jenkins skal til at lukke ned
-UpdateCenter.PluginCategory.slaves=Slavestartere og kontroll\u00f8rer
 Api.MultipleMatch=XPath "{0}" matcher {1} noder. \
 Lav en XPath der kun matcher en, eller brug en "omslags" foresp\u00f8rgselsparameter til at samle dem alle under et rodelement. 
-Slave.UnableToLaunch=Kan ikke starte en slave agent for {0}{1}
 Queue.Unknown=???
 BallColor.Unstable=Ustabil
 Job.AllRecentBuildFailed=Alle de seneste byg er fejlet.
@@ -212,10 +200,8 @@ Queue.WaitingForNextAvailableExecutorOn=Venter p\u00e5 n\u00e6ste ledige afvikle
 Hudson.NotANegativeNumber=Ikke en negativ v\u00e6rdi
 UpdateCenter.PluginCategory.misc=Diverse
 Queue.InProgress=Et byg er allerede i gang
-Computer.DeletePermission.Description=Denne rettighed tillader brugere at slette eksisterende slaver.
 UpdateCenter.Status.ConnectionFailed= 
 UpdateCenter.PluginCategory.maven=Maven
-Computer.Permissions.Title=Slave
 BallColor.Success=Succes
 UpdateCenter.PluginCategory.upload=Artifaktsendere
 Permalink.LastUnstableBuild=Seneste ustabile byg
diff --git a/core/src/main/resources/hudson/model/Messages_de.properties b/core/src/main/resources/hudson/model/Messages_de.properties
index 5364f43697..21e7988d2c 100644
--- a/core/src/main/resources/hudson/model/Messages_de.properties
+++ b/core/src/main/resources/hudson/model/Messages_de.properties
@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-AbstractBuild.BuildingRemotely=Baue auf Slave {0}
 AbstractBuild.BuildingOnMaster=Baue auf Master
 AbstractBuild_Building=Baue
 AbstractBuild.BuildingInWorkspace=\ in Arbeitsbereich {0}
@@ -86,23 +85,14 @@ CLI.offline-node.shortDescription=Knoten wird bis zum n\u00e4chsten "online-node
 CLI.safe-restart.shortDescription=Startet Jenkins neu.
 Queue.init=Build-Warteschlange neu initialisieren
 
-Computer.Caption=Slave {0}
-Computer.Permissions.Title=Slave
-Computer.ConfigurePermission.Description=Dieses Recht erlaubt, Slaves zu konfigurieren.
-Computer.DeletePermission.Description=Dieses Recht erlaubt, bestehende Slaves zu l\u00f6schen.
-Computer.CreatePermission.Description=Dieses Recht erlaubt, neue Slaves zu erstellen.
-Computer.ConnectPermission.Description=Dieses Recht erlaubt, Slaves zu verbinden oder als verf\u00fcgbar zu markieren.
-Computer.DisconnectPermission.Description=Dieses Recht erlaubt, bestehende Slaves zu entfernen oder als vor\u00fcbergehend nicht verf\u00fcgbar zu markieren.
 
-ComputerSet.NoSuchSlave=Slave ''{0}'' existiert nicht.
-ComputerSet.SlaveAlreadyExists=Ein Slave mit Namen ''{0}'' existiert bereits.
-ComputerSet.SpecifySlaveToCopy=Geben Sie an, welcher Slave kopiert werden soll
 ComputerSet.DisplayName=Knoten
 
 Executor.NotAvailable=nicht verf\u00fcgbar
 
 
 FreeStyleProject.DisplayName="Free Style"-Softwareprojekt bauen
+FreeStyleProject.Description=Dieses Profil ist das meistgenutzte in Jenkins. Jenkins baut Ihr Projekt, wobei Sie universell jedes SCM System mit jedem Build-Verfahren kombinieren k\u00F6nnen. Dieses Profil ist nicht nur auf das Bauen von Software beschr\u00E4nkt, sondern kann dar\u00FCber hinaus auch f\u00FCr weitere Anwendungsgebiete verwendet werden.
 
 HealthReport.EmptyString=
 
@@ -208,18 +198,10 @@ Run.Summary.BrokenSinceThisBuild=Defekt seit diesem Build.
 Run.Summary.BrokenSince=Defekt seit Build {0}
 Run.Summary.Unknown=Ergebnis unbekannt
 
-Slave.InvalidConfig.Executors=Ung\u00fcltige Slave-Einstellungen f\u00fcr {0}. Ung\u00fcltige Anzahl von Build-Prozessoren.
-Slave.InvalidConfig.NoName=Ung\u00fcltige Slave-Einstellungen. Name ist leer.
-Slave.InvalidConfig.NoRemoteDir=Ung\u00fcltige Slave-Einstellungen f\u00fcr {0}. Kein entferntes Verzeichnis angegeben.
-Slave.Launching={0} Starte Slave-Agent
 Slave.Network.Mounted.File.System.Warning=\
   Sind Sie sicher, da\u00df Sie ein Netzlaufwerk als Stammverzeichnis verwenden m\u00f6chen? \
   Hinweis: Dieses Verzeichnis mu\u00df nicht vom Master-Knoten aus sichtbar sein.
 Slave.Remote.Director.Mandatory=Ein Stammverzeichnis muss angegeben werden.
-Slave.Terminated={0} Slave-Agent wurde beendet
-Slave.UnableToLaunch=Kann keinen Slave-Agenten starten f\u00fcr {0}{1}
-Slave.UnixSlave=Dies ist ein UNIX-Slave
-Slave.WindowsSlave=Dies ist ein Windows-Slave
 
 UpdateCenter.DownloadButNotActivated=Erfolgreich heruntergeladen. Wird beim n\u00e4chsten Neustart aktiviert.
 UpdateCenter.n_a=(nicht verf\u00fcgbar)
@@ -257,7 +239,6 @@ UpdateCenter.PluginCategory.post-build=Post-Build-Aktionen
 UpdateCenter.PluginCategory.report=Build-Berichte
 UpdateCenter.PluginCategory.scm=Versionsverwaltung
 UpdateCenter.PluginCategory.scm-related=Versionsverwaltung (weiteres Umfeld)
-UpdateCenter.PluginCategory.slaves=Slave-Knoten Management
 UpdateCenter.PluginCategory.trigger=Build-Ausl\u00f6ser
 UpdateCenter.PluginCategory.ui=Benutzeroberfl\u00e4che
 UpdateCenter.PluginCategory.upload=Distribution von Artefakten
diff --git a/core/src/main/resources/hudson/model/Messages_en_GB.properties b/core/src/main/resources/hudson/model/Messages_en_GB.properties
index 9e18978be2..b9d3954d76 100644
--- a/core/src/main/resources/hudson/model/Messages_en_GB.properties
+++ b/core/src/main/resources/hudson/model/Messages_en_GB.properties
@@ -1 +1 @@
-ParametersDefinitionProperty.DisplayName=This build is parameterised
+ParametersDefinitionProperty.DisplayName=This project is parameterised
diff --git a/core/src/main/resources/hudson/model/Messages_es.properties b/core/src/main/resources/hudson/model/Messages_es.properties
index 0fcdb186d2..29feb6dbeb 100644
--- a/core/src/main/resources/hudson/model/Messages_es.properties
+++ b/core/src/main/resources/hudson/model/Messages_es.properties
@@ -74,7 +74,7 @@ Executor.NotAvailable=N/D
 
 
 FreeStyleProject.DisplayName=Crear un proyecto de estilo libre
-
+FreeStyleProject.Description=Esta es la caracter\u00EDstica principal de Jenkins, la de ejecutar el proyecto combinando cualquier tipo de repositorio de software (SCM) con cualquier modo de construcci\u00F3n o ejecuci\u00F3n (make, ant, mvn, rake, script ...). Por tanto se podr\u00E1 tanto compilar y empaquetar software, como ejecutar cualquier proceso que requiera monitorizaci\u00F3n.
 
 Hudson.BadPortNumber=N\u00famero err\u00f3neo de puerto {0}
 Hudson.Computer.Caption=Principal
diff --git a/core/src/main/resources/hudson/model/Messages_et.properties b/core/src/main/resources/hudson/model/Messages_et.properties
new file mode 100644
index 0000000000..ff3d7fc8bd
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_et.properties
@@ -0,0 +1 @@
+FreeStyleProject.Description=See on Jenkinsi p\u00F5hifunktsioon! Jenkins ehitab su projekti, kombineerides sinu versioonihalduse mistahes ehitusprotsessiga. Sa v\u00F5id seda kasutada ka muudeks asjadeks kui tarkvara ehitamine.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Messages_fi.properties b/core/src/main/resources/hudson/model/Messages_fi.properties
index b8537b4403..cc62c20834 100644
--- a/core/src/main/resources/hudson/model/Messages_fi.properties
+++ b/core/src/main/resources/hudson/model/Messages_fi.properties
@@ -1 +1,3 @@
 ManageJenkinsAction.DisplayName=Hallitse Jenkinsia
+
+FreeStyleProject.Description=T\u00E4m\u00E4 on Jenkins t\u00E4rkein ominaisuus. Jenkins rakentaa projektisi k\u00E4ytt\u00E4en versionhallintaa ja buildij\u00E4rjestelmi\u00E4. Voit k\u00E4ytt\u00E4\u00E4 t\u00E4t\u00E4 my\u00F6s muuhun kuin ohjelmien k\u00E4\u00E4nt\u00E4miseen.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Messages_fr.properties b/core/src/main/resources/hudson/model/Messages_fr.properties
index 8808e4727c..f9d5295135 100644
--- a/core/src/main/resources/hudson/model/Messages_fr.properties
+++ b/core/src/main/resources/hudson/model/Messages_fr.properties
@@ -50,18 +50,12 @@ BallColor.Pending=En attente
 BallColor.Success=Succ\u00e8s
 BallColor.Unstable=Instable
 
-Computer.Caption=Esclave {0}
-Computer.Permissions.Title=Esclave
-Computer.ConfigurePermission.Description=Ce droit permet aux utilisateurs de configurer les esclaves.
-Computer.DeletePermission.Description=Ce droit permet aux utilisateurs de supprimer les esclaves.
 
-ComputerSet.NoSuchSlave=Cet esclave n''existe pas : {0}
-ComputerSet.SlaveAlreadyExists=L''esclave appel\u00e9 ''{0}'' existe d\u00e9j\u00e0
-ComputerSet.SpecifySlaveToCopy=Sp\u00e9cifiez l''esclave \u00e0 copier
 Executor.NotAvailable=N/A
 
 
 FreeStyleProject.DisplayName=Construire un projet free-style
+FreeStyleProject.Description=Ceci est la fonction principale de Jenkins qui sert \u00E0 builder (construire) votre projet. <br>Vous pouvez int\u00E9grer tous les outils de gestion de version avec tous les syst\u00E8mes de build. <br>Il est m\u00EAme possible d''utiliser Jenkins pour tout autre chose qu''un build logiciel.
 
 Hudson.BadPortNumber=Num\u00e9ro de port incorrect {0}
 Hudson.Computer.Caption=Ma\u00eetre
@@ -126,14 +120,6 @@ Run.UpdatePermission.Description=\
   Cette option permet aux utilisateurs de mettre \u00e0 jour la description et d''autres propri\u00e9t\u00e9s d''un build, \
   par exemple pour laisser des notes sur la cause d''\u00e9chec d''un build.
 
-Slave.InvalidConfig.Executors=Configuration esclave invalide pour {0}. Nombre d''ex\u00e9cuteurs invalide.
-Slave.InvalidConfig.NoName=Configuration esclave invalide. Le nom est vide.
-Slave.InvalidConfig.NoRemoteDir=Configuration esclave invalide pour {0}. Pas de r\u00e9pertoire distant fourni
-Slave.Launching={0} Lancement de l''agent esclave
-Slave.Terminated={0} l''agent esclave a \u00e9t\u00e9 termin\u00e9
-Slave.UnableToLaunch=Impossible de lancer l''agent esclave pour {0} {1}
-Slave.UnixSlave=Ceci est un esclave Unix
-Slave.WindowsSlave=Ceci est un esclave Windows
 
 View.Permissions.Title=Vues
 View.CreatePermission.Description=\
diff --git a/core/src/main/resources/hudson/model/Messages_hi_IN.properties b/core/src/main/resources/hudson/model/Messages_hi_IN.properties
new file mode 100644
index 0000000000..58a16a05dd
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_hi_IN.properties
@@ -0,0 +1 @@
+FreeStyleProject.Description=\u092F\u0939 \u091C\u0947\u0928\u0915\u0940\u0902\u0938 \u0915\u0940 \u0915\u0947\u0902\u0926\u094D\u0930\u0940\u092F \u0935\u093F\u0936\u0947\u0937\u0924\u093E \u0939\u0948\u0964 \u091C\u0947\u0928\u0915\u0940\u0902\u0938, \u0915\u093F\u0938\u0940 \u092D\u0940 \u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u092A\u094D\u0930\u0923\u093E\u0932\u0940 \u0915\u0947 \u0938\u093E\u0925 \u0915\u093F\u0938\u0940 \u092D\u0940 \u0938\u0949\u092B\u094D\u091F\u0935\u0947\u092F\u0930 \u0935\u093F\u0928\u094D\u092F\u093E\u0938 \u092A\u094D\u0930\u092C\u0902\u0927\u0928 \u0915\u093E \u0938\u0902\u092F\u094B\u091C\u0928 \u0915\u0930\u0915\u0947 \u0906\u092A\u0915\u0940 \u092A\u0930\u093F\u092F\u094B\u091C\u0928\u093E \u0915\u093E \u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u0915\u0930\u0947\u0917\u093E, \u0914\u0930 \u0907\u0938\u0915\u093E \u092A\u094D\u0930\u092F\u094B\u0917 \u0938\u0949\u092B\u094D\u091F\u0935\u0947\u092F\u0930 \u0915\u093E \u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u0915\u0930\u0928\u0947 \u0915\u0947 \u0905\u0932\u093E\u0935\u093E \u0905\u0928\u094D\u092F \u0915\u093E\u0930\u094D\u092F\u094B\u0902 \u0915\u0947 \u0932\u093F\u090F \u092D\u0940 \u0915\u093F\u092F\u093E \u091C\u093E \u0938\u0915\u0924\u093E \u0939\u0948.
diff --git a/core/src/main/resources/hudson/model/Messages_id.properties b/core/src/main/resources/hudson/model/Messages_id.properties
new file mode 100644
index 0000000000..fbb242f35c
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_id.properties
@@ -0,0 +1 @@
+FreeStyleProject.Description=Ini adalah fitur sentral dari Jenkins. Jenkins akan membangun proyek anda, mengkombinasikan SCM apa pun dengan sistem pembangunan,  dan ini akan digunakan untuk sesuatu selain pembangunan piranti lunak.
diff --git a/core/src/main/resources/hudson/model/Messages_it.properties b/core/src/main/resources/hudson/model/Messages_it.properties
index faa69c1371..6beced04f0 100644
--- a/core/src/main/resources/hudson/model/Messages_it.properties
+++ b/core/src/main/resources/hudson/model/Messages_it.properties
@@ -28,7 +28,6 @@ AbstractBuild.KeptBecause=kept because of {0}
 
 AbstractItem.NoSuchJobExists=Nessun job di nome ''{0}'' esiste. Intendevi forse ''{1}''?
 AbstractItem.Pronoun=Job
-AbstractProject.AssignedLabelString_NoMatch_DidYouMean=There''s no slave/cloud that matches this assignment. Did you mean ''{1}'' instead of ''{0}''?
 AbstractProject.NewBuildForWorkspace=Scheduling a new build to get a workspace.
 AbstractProject.AwaitingBuildForWorkspace=Awaiting build to get a workspace.
 AbstractProject.Pronoun=Progetto
@@ -56,8 +55,6 @@ AbstractProject.WipeOutPermission.Description=\
   This permission grants the ability to wipe out the contents of a workspace.
 AbstractProject.AssignedLabelString.InvalidBooleanExpression=\
   Espressione booleana non valida: {0}
-AbstractProject.AssignedLabelString.NoMatch=\
-  There's no slave/cloud that matches this assignment
 
 Api.MultipleMatch=XPath "{0}" corrisponde a {1} nodi. \
     Creare un XPath che corrisponde ad un solo valore, oppure utilizzare una query "wrapper"  \
@@ -81,24 +78,13 @@ CLI.offline-node.shortDescription=Stop using a node for performing builds tempor
 CLI.wait-node-online.shortDescription=Attende che il nodo sia attivo
 CLI.wait-node-offline.shortDescription=Attende che un nodo sia disattivo
 
-Computer.Caption=Slave {0}
-Computer.NoSuchSlaveExists=No such slave "{0}" exists. Did you mean "{1}"?
-Computer.Permissions.Title=Slave
-Computer.ConfigurePermission.Description=This permission allows users to configure slaves.
-Computer.DeletePermission.Description=This permission allows users to delete existing slaves.
-Computer.CreatePermission.Description=This permission allows users to create slaves.
-Computer.ConnectPermission.Description=This permission allows users to connect slaves or mark slaves as online.
-Computer.DisconnectPermission.Description=This permission allows users to disconnect slaves or mark slaves as temporarily offline.
-Computer.BadChannel=Slave node offline or not a remote channel (such as master node).
 
-ComputerSet.NoSuchSlave=No such slave: {0}
-ComputerSet.SlaveAlreadyExists=Slave called ''{0}'' already exists
-ComputerSet.SpecifySlaveToCopy=Specify which slave to copy
 ComputerSet.DisplayName=nodes
 Executor.NotAvailable=N/A
 
 
 FreeStyleProject.DisplayName=Configura una build di tipo generico
+FreeStyleProject.Description=Questa \u00E8 la funzione principale di Jenkins. Jenkins effettuer\u00E0 una compilazione del progetto, combinando qualsiasi SCM con qualsiasi sistema di compilazione e si pu\u00F2 usare anche per qualcosa di altro che non sia un programma di compilazione.
 
 HealthReport.EmptyString=
 
@@ -204,16 +190,8 @@ Run.Summary.BrokenSinceThisBuild=broken since this build
 Run.Summary.BrokenSince=broken since build {0}
 Run.Summary.Unknown=?
 
-Slave.InvalidConfig.Executors=Invalid slave configuration for {0}. Invalid # of executors.
-Slave.InvalidConfig.NoName=Invalid slave configuration. Name is empty
-Slave.InvalidConfig.NoRemoteDir=Invalid slave configuration for {0}. No remote directory given
-Slave.Launching={0} Launching slave agent
 Slave.Network.Mounted.File.System.Warning=Are you sure you want to use network mounted file system for FS root? Note that this directory does not need to be visible to the master.
 Slave.Remote.Director.Mandatory=Remote directory is mandatory
-Slave.Terminated={0} slave agent was terminated
-Slave.UnableToLaunch=Unable to launch the slave agent for {0}{1}
-Slave.UnixSlave=This is a Unix slave
-Slave.WindowsSlave=This is a Windows slave
 
 UpdateCenter.DownloadButNotActivated=Downloaded Successfully. Will be activated during the next boot
 View.Permissions.Title=View
@@ -249,7 +227,6 @@ UpdateCenter.PluginCategory.post-build=Other Post-Build Actions
 UpdateCenter.PluginCategory.report=Build Reports
 UpdateCenter.PluginCategory.scm=Source Code Management
 UpdateCenter.PluginCategory.scm-related=Source Code Management related
-UpdateCenter.PluginCategory.slaves=Slave Launchers and Controllers
 UpdateCenter.PluginCategory.trigger=Build Triggers
 UpdateCenter.PluginCategory.ui=User Interface
 UpdateCenter.PluginCategory.upload=Artifact Uploaders
@@ -266,14 +243,14 @@ Permalink.LastFailedBuild=Last failed build
 
 ParameterAction.DisplayName=Parameters
 StringParameterDefinition.DisplayName=String Parameter
-TextParameterDefinition.DisplayName=Text Parameter
+TextParameterDefinition.DisplayName=Multi-line String Parameter
 FileParameterDefinition.DisplayName=File Parameter
 BooleanParameterDefinition.DisplayName=Boolean Value
 ChoiceParameterDefinition.DisplayName=Choice
 RunParameterDefinition.DisplayName=Run Parameter
 PasswordParameterDefinition.DisplayName=Password Parameter
 
-Node.Mode.NORMAL=Utilize this slave as much as possible
+Node.Mode.NORMAL=Utilize this agent as much as possible
 Node.Mode.EXCLUSIVE=Leave this machine for tied jobs only
 
 ListView.DisplayName=List View
diff --git a/core/src/main/resources/hudson/model/Messages_ja.properties b/core/src/main/resources/hudson/model/Messages_ja.properties
index 44c18eefc5..f36f34306a 100644
--- a/core/src/main/resources/hudson/model/Messages_ja.properties
+++ b/core/src/main/resources/hudson/model/Messages_ja.properties
@@ -28,8 +28,6 @@ AbstractBuild.KeptBecause={0}\u306e\u305f\u3081\u3001\u4fdd\u5b58\u3057\u307e\u3
 
 AbstractItem.NoSuchJobExists=\u30b8\u30e7\u30d6''{0}''\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002''{1}''\u3067\u3059\u304b?
 AbstractItem.Pronoun=\u30b8\u30e7\u30d6
-AbstractProject.AssignedLabelString_NoMatch_DidYouMean=\
-  \u8a72\u5f53\u3059\u308b\u30b9\u30ec\u30fc\u30d6\u3084\u30ce\u30fc\u30c9\u306f\u3042\u308a\u307e\u305b\u3093\u3002''{0}''\u3067\u306f\u306a\u304f\u3066''{1}''\u306e\u3053\u3068\u3067\u3059\u304b?
 AbstractProject.NewBuildForWorkspace=\u65b0\u898f\u306e\u30d3\u30eb\u30c9\u3092\u5b9f\u884c\u3057\u3066\u3001\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u3092\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 AbstractProject.AwaitingBuildForWorkspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u304c\u7528\u610f\u3067\u304d\u308b\u307e\u3067\u30d3\u30eb\u30c9\u3092\u4fdd\u7559\u3057\u307e\u3059\u3002
 AbstractProject.Pronoun=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
@@ -60,7 +58,6 @@ AbstractProject.CancelPermission.Description=\
   \u30d3\u30eb\u30c9\u306e\u30ad\u30e3\u30f3\u30bb\u30eb\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002
 AbstractProject.AssignedLabelString.InvalidBooleanExpression=\
   \u30e9\u30d9\u30eb\u5f0f\u306b\u9593\u9055\u3044\u304c\u3042\u308a\u307e\u3059\u3002: {0}
-AbstractProject.AssignedLabelString.NoMatch=\
   \u8a72\u5f53\u3059\u308b\u30b9\u30ec\u30fc\u30d6\u3082\u3057\u304f\u306f\u30af\u30e9\u30a6\u30c9\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 AbstractProject.CustomWorkspaceEmpty=\u30ab\u30b9\u30bf\u30e0\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u304c\u5165\u529b\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 
@@ -77,21 +74,7 @@ BallColor.Pending=\u672a\u6c7a\u5b9a
 BallColor.Success=\u6210\u529f
 BallColor.Unstable=\u4e0d\u5b89\u5b9a
 
-Computer.Caption=\u30b9\u30ec\u30fc\u30d6 {0}
-Computer.NoSuchSlaveExists="{0}"\u3068\u3044\u3046\u30b9\u30ec\u30fc\u30d6\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002"{1}"\u306e\u3053\u3068\u3067\u3059\u304b?
-Computer.Permissions.Title=\u30b9\u30ec\u30fc\u30d6
-Computer.ExtendedReadPermission.Description=\u30b9\u30ec\u30fc\u30d6\u306e\u8a2d\u5b9a\u306e\u53c2\u7167\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002
-Computer.ConfigurePermission.Description=\u30b9\u30ec\u30fc\u30d6\u306e\u8a2d\u5b9a\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002
-Computer.DeletePermission.Description=\u30b9\u30ec\u30fc\u30d6\u306e\u524a\u9664\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002
-Computer.CreatePermission.Description=\u30b9\u30ec\u30fc\u30d6\u306e\u4f5c\u6210\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002
-Computer.ConnectPermission.Description=\u30b9\u30ec\u30fc\u30d6\u3078\u306e\u63a5\u7d9a\u3068\u30aa\u30f3\u30e9\u30a4\u30f3\u5316\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002
-Computer.DisconnectPermission.Description=\u30b9\u30ec\u30fc\u30d6\u306e\u5207\u65ad\u3068\u4e00\u6642\u7684\u306a\u30aa\u30d5\u30e9\u30a4\u30f3\u5316\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002
-Computer.BuildPermission.Description=\u30b9\u30ec\u30fc\u30d6\u4e0a\u3067\u306e\u30b8\u30e7\u30d6\u306e\u8d77\u52d5\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002
-Computer.BadChannel=\u30b9\u30ec\u30fc\u30d6\u30ce\u30fc\u30c9\u304c\u30aa\u30d5\u30e9\u30a4\u30f3\u304b\u30ea\u30e2\u30fc\u30c8\u30c1\u30e3\u30cd\u30eb\u3067\u3059(\u30de\u30b9\u30bf\u30fc\u30ce\u30fc\u30c9\u306a\u3069)\u3002
 
-ComputerSet.NoSuchSlave=\u30b9\u30ec\u30fc\u30d6\u304c\u5b58\u5728\u3057\u307e\u305b\u3093: {0}
-ComputerSet.SlaveAlreadyExists=''{0}''\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059
-ComputerSet.SpecifySlaveToCopy=\u30b3\u30d4\u30fc\u3059\u308b\u30b9\u30ec\u30fc\u30d6\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 ComputerSet.DisplayName=\u30ce\u30fc\u30c9
 
 Descriptor.From=(from <a href="{1}">{0}</a>)
@@ -100,6 +83,10 @@ Executor.NotAvailable=N/A
 
 
 FreeStyleProject.DisplayName=\u30d5\u30ea\u30fc\u30b9\u30bf\u30a4\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d3\u30eb\u30c9
+FreeStyleProject.Description=\
+  \u3082\u3063\u3068\u3082\u6c4e\u7528\u6027\u306e\u9ad8\u3044Jenkins\u306e\u4e2d\u6838\u6a5f\u80fd\u3067\u3059\u3002\u4efb\u610f\u306eSCM\u304b\u3089\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3001\
+  \u4efb\u610f\u306e\u30d3\u30eb\u30c9\u30b7\u30b9\u30c6\u30e0\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u30d3\u30eb\u30c9\u3067\u304d\u307e\u3059\u3002\u5f80\u3005\u306b\u3057\u3066\u3001\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306e\u30d3\u30eb\u30c9\u4ee5\u5916\u306b\u3082\
+  \u69d8\u3005\u306a\u4ed5\u4e8b\u306e\u81ea\u52d5\u5316\u306b\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
 
 HealthReport.EmptyString=
 
@@ -204,17 +191,9 @@ Run.Summary.BrokenSinceThisBuild=\u3053\u306e\u30d3\u30eb\u30c9\u304b\u3089\u654
 Run.Summary.BrokenSince=\u30d3\u30eb\u30c9{0}\u304b\u3089\u6545\u969c
 Run.Summary.Unknown=?
 
-Slave.InvalidConfig.Executors=\u30b9\u30ec\u30fc\u30d6 {0} \u306e\u8a2d\u5b9a\u306b\u8aa4\u308a\u304c\u3042\u308a\u307e\u3059\u3002\u540c\u6642\u5b9f\u884c\u6570\u304c\u4e0d\u6b63\u3067\u3059\u3002
-Slave.InvalidConfig.NoName=\u30b9\u30ec\u30fc\u30d6\u306e\u8a2d\u5b9a\u306b\u8aa4\u308a\u304c\u3042\u308a\u307e\u3059\u3002\u540d\u524d\u304c\u672a\u8a2d\u5b9a\u3067\u3059\u3002
-Slave.InvalidConfig.NoRemoteDir=\u30b9\u30ec\u30fc\u30d6 {0} \u306e\u8a2d\u5b9a\u306b\u8aa4\u308a\u304c\u3042\u308a\u307e\u3059\u3002\u30ea\u30e2\u30fc\u30c8FS\u30eb\u30fc\u30c8\u304c\u672a\u8a2d\u5b9a\u3067\u3059\u3002
-Slave.Launching=\u30b9\u30ec\u30fc\u30d6\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3092\u8d77\u52d5\u3057\u307e\u3057\u305f\u3002{0} 
 Slave.Network.Mounted.File.System.Warning=\u672c\u5f53\u306bFS\u30eb\u30fc\u30c8\u3068\u3057\u3066\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30de\u30a6\u30f3\u30c8\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u3092\u4f7f\u7528\u3057\u305f\u3044\u3067\u3059\u304b\uff1f \u3053\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u30de\u30b9\u30bf\u30fc\u306b\u898b\u3048\u308b\u5fc5\u8981\u306f\u7121\u3044\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 Slave.Remote.Director.Mandatory=\u30ea\u30e2\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u5fc5\u9808\u3067\u3059\u3002
-Slave.Terminated=\u30b9\u30ec\u30fc\u30d6\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3092\u7d42\u4e86\u3057\u307e\u3057\u305f\u3002{0}
 Slave.the_remote_root_must_be_an_absolute_path=\u30ea\u30e2\u30fc\u30c9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u7d76\u5bfe\u30d1\u30b9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-Slave.UnableToLaunch=\u30b9\u30ec\u30fc\u30d6\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8 {0} \u3092\u8d77\u52d5\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002{1}
-Slave.UnixSlave=\u3053\u308c\u306fUnix\u306e\u30b9\u30ec\u30fc\u30d6\u3067\u3059\u3002
-Slave.WindowsSlave=\u3053\u308c\u306fWindows\u306e\u30b9\u30ec\u30fc\u30d6\u3067\u3059\u3002
 
 UpdateCenter.DownloadButNotActivated=\u6b63\u5e38\u306b\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f\u3002\u6b21\u306e\u30d6\u30fc\u30c8\u6642\u306b\u6709\u52b9\u306b\u306a\u308a\u307e\u3059\u3002
 UpdateCenter.n_a=N/A
@@ -254,7 +233,6 @@ UpdateCenter.PluginCategory.post-build=\u30d3\u30eb\u30c9\u5f8c\u306e\u30a2\u30a
 UpdateCenter.PluginCategory.report=\u30d3\u30eb\u30c9\u30ec\u30dd\u30fc\u30c8
 UpdateCenter.PluginCategory.scm=\u30bd\u30fc\u30b9\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0
 UpdateCenter.PluginCategory.scm-related=\u30bd\u30fc\u30b9\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u95a2\u9023
-UpdateCenter.PluginCategory.slaves=\u30b9\u30ec\u30fc\u30d6\u306e\u8d77\u52d5\u3068\u7ba1\u7406
 UpdateCenter.PluginCategory.trigger=\u30d3\u30eb\u30c9\u30c8\u30ea\u30ac
 UpdateCenter.PluginCategory.ui=\u30e6\u30fc\u30b6\u30fc\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9
 UpdateCenter.PluginCategory.upload=\u6210\u679c\u7269\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
diff --git a/core/src/main/resources/hudson/model/Messages_ko.properties b/core/src/main/resources/hudson/model/Messages_ko.properties
index 70020b26be..02b6a1d0ae 100644
--- a/core/src/main/resources/hudson/model/Messages_ko.properties
+++ b/core/src/main/resources/hudson/model/Messages_ko.properties
@@ -1,2 +1,4 @@
 ManageJenkinsAction.DisplayName=Jenkins \uAD00\uB9AC
 ParametersDefinitionProperty.DisplayName=\uC774 \uBE4C\uB4DC\uB294 \uB9E4\uAC1C\uBCC0\uC218\uAC00 \uC788\uC2B5\uB2C8\uB2E4
+
+FreeStyleProject.Description=\uC774\uAC83\uC740 Jenkins\uC758 \uC8FC\uC694 \uAE30\uB2A5\uC785\uB2C8\uB2E4. Jenkins\uC740 \uC5B4\uB290 \uBE4C\uB4DC \uC2DC\uC2A4\uD15C\uACFC \uC5B4\uB5A4 SCM(\uD615\uC0C1\uAD00\uB9AC)\uC73C\uB85C \uBB36\uC778 \uB2F9\uC2E0\uC758 \uD504\uB85C\uC81D\uD2B8\uB97C \uBE4C\uB4DC\uD560 \uAC83\uC774\uACE0, \uC18C\uD504\uD2B8\uC6E8\uC5B4 \uBE4C\uB4DC\uBCF4\uB2E4 \uB2E4\uB978 \uC5B4\uB5A4 \uAC83\uC5D0 \uC790\uC8FC \uC0AC\uC6A9\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Messages_lt.properties b/core/src/main/resources/hudson/model/Messages_lt.properties
index 4dac83724a..f29e8e9d88 100644
--- a/core/src/main/resources/hudson/model/Messages_lt.properties
+++ b/core/src/main/resources/hudson/model/Messages_lt.properties
@@ -1 +1,3 @@
 ParametersDefinitionProperty.DisplayName=\u0160is darbas yra parametrizuotas
+
+FreeStyleProject.Description=Pagrindin\u0117 Jenkins funkcija. Jenkins sukonstruos j\u016Bs\u0173 projekt\u0105,  sujungdamas betkok\u012F SCM su betkokia konstravimo sistema. \u0160is darbo tipas gali b\u016Bt pritaikytas ne tik program\u0173 konstravimui.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Messages_nb_NO.properties b/core/src/main/resources/hudson/model/Messages_nb_NO.properties
index fe7187183a..d1098629e6 100644
--- a/core/src/main/resources/hudson/model/Messages_nb_NO.properties
+++ b/core/src/main/resources/hudson/model/Messages_nb_NO.properties
@@ -1,2 +1,4 @@
 ManageJenkinsAction.DisplayName=Konfigurer Jenkins
 ParametersDefinitionProperty.DisplayName=Denne build har parametre
+
+FreeStyleProject.Description=Dette er en sentral egenskap ved Jenkins. Jenkins bygger dine prosjekter, kombinerer SCM (Source Control Management - Kildekodekontrollsystem ) med forskjellige byggsystemer og denne kan ogs\u00E5 brukes til mer enn bare \u00E5 bygge applikasjoner.
diff --git a/core/src/main/resources/hudson/model/Messages_nl.properties b/core/src/main/resources/hudson/model/Messages_nl.properties
index e7b5b57aa6..3db4e11f0b 100644
--- a/core/src/main/resources/hudson/model/Messages_nl.properties
+++ b/core/src/main/resources/hudson/model/Messages_nl.properties
@@ -44,12 +44,12 @@ BallColor.Pending=In afwachting
 BallColor.Success=Succes
 BallColor.Unstable=Onstabiel
 
-Computer.Caption=Slaaf {0}
 
 Executor.NotAvailable=Niet beschikbaar
 
 
 FreeStyleProject.DisplayName=Bouw een vrije stijl type software project
+FreeStyleProject.Description=Dit is de basisfunctionaliteit van Jenkins. Bij dit type project kun je gebruik maken van een willekeurige combinatie van versiebeheer- en bouwsysteem. Je zou Jenkins zelfs kunnen gebruiken voor andere zaken dan het bouwen van software.
 
 Hudson.BadPortNumber=Verkeerd poortnummer {0}
 Hudson.Computer.Caption=Hoofdnode
@@ -86,14 +86,6 @@ Run.MarkedExplicitly=Expliciet gemarkeerd ter opbouw van historiek
 Run.Permissions.Title=Starten
 Run.UnableToDelete=Kan {0} niet verwijderen: {1}
 
-Slave.InvalidConfig.Executors=Ongeldige configuratie voor slaaf {0}: Ongeldig aantal uitvoerders.
-Slave.InvalidConfig.NoName=Ongeldige configuratie voor slaaf. Geen naam gespecificeerd.
-Slave.InvalidConfig.NoRemoteDir=Ongeldige configuratie voor slaaf {0}. Geen pad op afstand opgegeven.
-Slave.Launching={0} Slaaf node wordt gestart.
-Slave.Terminated={0} Slaaf node werd be\u00ebindigd
-Slave.UnableToLaunch=Kon de slaaf node niet starten voor {0} {1}
-Slave.UnixSlave=Dit is een Unix slaaf node
-Slave.WindowsSlave=Dit is een Windows slaaf node
 
 View.Permissions.Title=Tonen
 Permalink.LastBuild=Laatste bouwpoging
diff --git a/core/src/main/resources/hudson/model/Messages_pl.properties b/core/src/main/resources/hudson/model/Messages_pl.properties
index 87f49975e9..1ffaf84e4e 100644
--- a/core/src/main/resources/hudson/model/Messages_pl.properties
+++ b/core/src/main/resources/hudson/model/Messages_pl.properties
@@ -46,3 +46,4 @@ UpdateCenter.Status.Success=Zako\u0144czono pomy\u015Blnie
 MyViewsProperty.DisplayName=Moje widoki
 MyViewsProperty.GlobalAction.DisplayName=Moje widoki
 
+FreeStyleProject.Description=To jest podstawowa funkcja Jenkinsa. Jenkins stworzy projekt \u0142\u0105cz\u0105cy dowolny SCM z dowolnym systemem buduj\u0105cym, mo\u017Ce to by\u0107 r\u00F3wnie\u017C wykorzystane do czego\u015B innego ni\u017C budowanie oprogramowania.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Messages_pt_BR.properties b/core/src/main/resources/hudson/model/Messages_pt_BR.properties
index e835890220..0a3f406e25 100644
--- a/core/src/main/resources/hudson/model/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/Messages_pt_BR.properties
@@ -44,12 +44,12 @@ BallColor.Pending=Pendente
 BallColor.Success=Sucesso
 BallColor.Unstable=Inst\u00e1vel
 
-Computer.Caption=Slave {0}
 
 Executor.NotAvailable=N/D
 
 
 FreeStyleProject.DisplayName=Construir um projeto de software free-style
+FreeStyleProject.Description=Esta \u00e9 a central de funcionalidades do Jenkins. Ele construir\u00e1 seu projeto,e voc\u00ea pode combinar qualquer SCM com qualquer sistema de builds, e ele at\u00e9 mesmo pode ser usado para outras jobs diferentes de builds de software.
 
 Hudson.BadPortNumber=N\u00famero de porta ruim {0}
 Hudson.Computer.Caption=Master
@@ -85,14 +85,6 @@ Run.MarkedExplicitly=Explicitamente marcada para manter o registro
 Run.Permissions.Title=Executar
 Run.UnableToDelete=N\u00e3o foi poss\u00edvel excluir {0}: {1}
 
-Slave.InvalidConfig.Executors=Configura\u00e7\u00e3o de slave inv\u00e1lida para {0}. Inv\u00e1lido # de executores.
-Slave.InvalidConfig.NoName=Configura\u00e7\u00e3o de slave inv\u00e1lida. O nome est\u00e1 vazio
-Slave.InvalidConfig.NoRemoteDir=Configura\u00e7\u00e3o de slave inv\u00e1lida para {0}. Nenhum diret\u00f3rio remoto foi informado
-Slave.Launching={0} Iniciando agente slave
-Slave.Terminated={0} Agente slave foi encerrado
-Slave.UnableToLaunch=N\u00e3o foi poss\u00edvel iniciar o agente slave para {0}{1}
-Slave.UnixSlave=Este \u00e9 um slave Unix
-Slave.WindowsSlave=Este \u00e9 um slave Windows
 
 View.Permissions.Title=Vis\u00e3o
 Permalink.LastBuild=\u00daltimo build
@@ -123,8 +115,6 @@ MyViewsProperty.GlobalAction.DisplayName= Minhas views
 Run.UpdatePermission.Description=Essa permiss\u00e3o permite aos usu\u00e1rios atualizarem a descri\u00e7\u00e3o e outras propriedades do build
 # String Parameter
 StringParameterDefinition.DisplayName=Par\u00e2metro string
-# Utilize this slave as much as possible
-Node.Mode.NORMAL=Utilize este slave, tanto quanto poss\u00edvel
 # Global view {0} does not exist
 ProxyView.NoSuchViewExists= Vis\u00e3o global {0} n\u00e3o existe
 # External Site/Tool Integrations
@@ -160,8 +150,6 @@ CLI.safe-restart.shortDescription=Seguro reiniciar o Jenkins
 CLI.quiet-down.shortDescription=Desativar em modo silencioso, em prepara\u00e7\u00e3o para o rein\u00edcio. N\u00e3o come\u00e7e nenhum build.
 # Include a global view
 ProxyView.DisplayName=Incluir uma vis\u00e3o global
-# Specify which slave to copy
-ComputerSet.SpecifySlaveToCopy=Especifica para qual slave copiar
 # Number may not be negative
 Hudson.NotANonNegativeNumber=N\u00famero n\u00e3o pode ser negativo
 # No existing build. Scheduling a new one.
@@ -190,10 +178,6 @@ Run.Summary.Unstable=Inst\u00e1vel
 # Discard all the loaded data in memory and reload everything from file system. Useful when you modified config files directly on disk.
 CLI.reload-configuration.shortDescription=Descarta todo o conte\u00fado de mem\u00f3ria e recarrega novamente a partir do arquivo. /
 Indicado quando voc\u00ea modificou os arquivos diretamente no disco.
-# Slave called ''{0}'' already exists
-ComputerSet.SlaveAlreadyExists=Slave ''{0}'' j\u00e1 existe
-# No such slave: {0}
-ComputerSet.NoSuchSlave=Nenhum slave: {0}
 # Disables a job
 CLI.disable-job.shortDescription=Desabilitar uma job
 # Build Triggers
@@ -261,8 +245,6 @@ Label.ProvisionedFrom=Aprovisionado para {0}
 Run.Summary.Aborted=Abortado
 # Build Reports
 UpdateCenter.PluginCategory.report=Relat\u00f3rio de builds
-# This permission allows users to configure slaves.
-Computer.ConfigurePermission.Description=Essa permiss\u00e3o permite aos usu\u00e1rios configurarem os slaves
 # Source Code Management
 UpdateCenter.PluginCategory.scm=Gerenciamento de c\u00f3digo fonte
 # \
@@ -283,8 +265,6 @@ PasswordParameterDefinition.DisplayName=Par\u00e2metro da senha
 UpdateCenter.PluginCategory.cluster=Gerenciamento de cluster e builds distribu\u00eddos
 # Started by remote host {0}
 Cause.RemoteCause.ShortDescription=Iniciado pelo host remoto {0}
-# Slave node offline or not a remote channel (such as master node).
-Computer.BadChannel=N\u00f3 slave est\u00e1 offline ou n\u00e3o existe um canal remoto (n\u00f3 master)
 # Restoring the build queue
 Queue.init=Restaurando a fila de builds
 # the master Jenkins node
@@ -308,9 +288,6 @@ MyViewsProperty.ViewExistsCheck.AlreadyExists=J\u00e1 existe uma view com o nome
 Hudson.AdministerPermission.Description=Permiss\u00e3o para habilitar a configura\u00e7\u00e3o ampla
 # Jenkins is about to shut down
 Queue.HudsonIsAboutToShutDown=Jenkins est\u00e1 prestes a encerrar
-# {0} less {0,choice,0#tests are|1#test is|1<tests are} failing (total {1})
-# Slave Launchers and Controllers
-UpdateCenter.PluginCategory.slaves=Controladores e lan\u00e7adores slave
 # broken since build {0}
 Run.Summary.BrokenSince=Quebra desde o build {0}
 # \
@@ -345,16 +322,10 @@ Queue.WaitingForNextAvailableExecutorOn=Aguardando pelo pr\u00f3ximo executor di
 Hudson.NotANegativeNumber=N\u00famero n\u00e3o negativo
 # Miscellaneous
 UpdateCenter.PluginCategory.misc=Diversos
-# This permission allows users to delete existing slaves.
-Computer.DeletePermission.Description=Permite aos usu\u00e1rios removerem os Slaves
-# \
-# <span class=error>Failed to connect to {0}. \
 # Perhaps you need to <a href="../pluginManager/advanced">configure HTTP proxy?</a></span>
 UpdateCenter.Status.ConnectionFailed=Erro ao conectar {0} /
 # Maven
 UpdateCenter.PluginCategory.maven=Maven
-# Slave
-Computer.Permissions.Title=Slave
 # Artifact Uploaders
 UpdateCenter.PluginCategory.upload=Carregadores de artefatos
 # Last unstable build
@@ -400,10 +371,6 @@ AbstractBuild_Building=Construindo
 Item.CREATE.description=Cria um novo job.
 # The remote root must be an absolute path.
 Slave.the_remote_root_must_be_an_absolute_path=A raiz remota deve ser um caminho absoluto.
-# This permission allows users to disconnect slaves or mark slaves as temporarily offline.
-Computer.DisconnectPermission.Description=Esta permiss\u00e3o deixa que usu\u00e1rios desconectem slaves ou os marque como temporariamente offline.
-# This permission allows users to create slaves.
-Computer.CreatePermission.Description=Exta permiss\u00e3o deixa usu\u00e1rios criarem slaves.
 # See a job. (You may deny this permission but allow Discover to force an anonymous user to log in to see the job.)
 Item.READ.description=Ver um job. (Voc\u00ea pode impedir essa permiss\u00e3o mas permitir Discover para forcar um usu\u00e1rio an\u00f4nimo a logar para ver o job)
 # This permission grants the ability to retrieve the artifacts produced by \
@@ -414,8 +381,6 @@ Run.ArtifactsPermission.Description=Esta permiss\u00e3o permite a habilidade de
  revogar esta permiss\u00e3o.
 # Invalid boolean expression: {0}
 AbstractProject.AssignedLabelString.InvalidBooleanExpression=Espress\u00e3o booleana inv\u00e1lida: {0}
-# This permission allows users to connect slaves or mark slaves as online.
-Computer.ConnectPermission.Description=Esta permiss\u00e3o deixa que usu\u00e1rios conectem slaves ou os marque como online.
 # originally caused by:
 Cause.UpstreamCause.CausedBy=originalmente causado por:
 # Invalid token provided.
@@ -424,12 +389,8 @@ BuildAuthorizationToken.InvalidTokenProvided=Token inv\u00e1lido fornecido.
 TextParameterDefinition.DisplayName=Par\u00e2metro de texto
 # Downloaded Successfully. Will be activated during the next boot
 UpdateCenter.DownloadButNotActivated=Download finalizado com sucesso. Ser\u00e1 ativado no pr\u00f3ximo boot
-# There\u2019s no slave/cloud that matches this assignment. Did you mean \u2018{1}\u2019 instead of \u2018{0}\u2019?
-AbstractProject.AssignedLabelString_NoMatch_DidYouMean=N\u00e3o h\u00e1 um slave ou n\u00favem que combine com esta atribui\u00e7\u00e3o. Voc\u00ea quis dizer \u2018{1}\u2019 ao inv\u00e9s de \u2018{0}\u2019?
 # {0} doesn\u2019t have a permission to run on {1}
 Node.LackingBuildPermission={0} n\u00e3o tem permiss\u00e3o para executar em {1}
-# This permission allows users to read slave configuration.
-Computer.ExtendedReadPermission.Description=Esta permiss\u00e3o deixa usu\u00e1rios lerem as configura\u00e7\u00f5es dos slaves.
 # Not built
 ResultTrend.NotBuilt=N\u00e3o constru\u00eddo
 # There are no nodes with the label \u2018{0}\u2019
@@ -470,18 +431,12 @@ ResultTrend.Failure=Falha
 AbstractProject.WipeOutPermission.Description=Esta permiss\u00e3o deixa que seja eleminado o conte\u00fado de um workspace.
 # Requires Choices.
 ChoiceParameterDefinition.MissingChoices=Exige escolhas.
-# This permission allows users to run jobs as them on slaves.
-Computer.BuildPermission.Description=Esta permiss\u00e3o deixa que usu\u00e1rios executem jobs em slaves.
-# No such slave "{0}" exists. Did you mean "{1}"?
-Computer.NoSuchSlaveExists=N\u00e3o existe o slave {0}. Voc\u00ea quis dizer "{1}"?
 # Aborted
 ResultTrend.Aborted=Abortado
 # This permission allows users to see views (implied by generic read access).
 View.ReadPermission.Description=Esta permiss\u00e3o deixa que usu\u00e1rios vejam views (inpl\u00edcito pela permiss\u00e3o gen\u00e9rica de leitura).
 # "{0}" is not allowed name
 Jenkins.NotAllowedName="{0}" n\u00e3o \u00e9 um nome permitido
-# There's no slave/cloud that matches this assignment
-AbstractProject.AssignedLabelString.NoMatch=N\u00e3o h\u00e1 um slave/n\u00favem que combine com esta atribui\u00e7\u00e3o
 # Workspace of {0} on {1}
 AbstractProject.WorkspaceTitleOnComputer=Workspace {0} em {1}
 # This permission grants the ability to cancel a scheduled, or abort a running, build.
diff --git a/core/src/main/resources/hudson/model/Messages_pt_PT.properties b/core/src/main/resources/hudson/model/Messages_pt_PT.properties
index e022d96cef..be8cf4950c 100644
--- a/core/src/main/resources/hudson/model/Messages_pt_PT.properties
+++ b/core/src/main/resources/hudson/model/Messages_pt_PT.properties
@@ -1 +1,3 @@
 ManageJenkinsAction.DisplayName=Gerir o Jenkins
+
+FreeStyleProject.Description=Isto \u00E9 uma caracter\u00EDstica central do Jenkins. Jenkins vai construir o seu projecto, combinando qualquer SCM com qualquer sistema de compila\u00E7\u00E3o e isto pode ser usado mesmo em qualquer outra compila\u00E7\u00E3o de software.
diff --git a/core/src/main/resources/hudson/model/Messages_ro.properties b/core/src/main/resources/hudson/model/Messages_ro.properties
index 106056997c..8a8fa99a17 100644
--- a/core/src/main/resources/hudson/model/Messages_ro.properties
+++ b/core/src/main/resources/hudson/model/Messages_ro.properties
@@ -1 +1,3 @@
 ParametersDefinitionProperty.DisplayName=Acest build este parametrizat
+
+FreeStyleProject.Description=Aceasta este func\u021Bionalitatea principal\u0103 a lui Jenkins. Jenkins va construi proiectul dvs, combin\u00E2nd orice SCM cu orice sistem de build-uri, \u0219i aceasta poate fi folosit\u0103 chiar \u0219i la altceva dec\u00E2t build-uri de aplica\u021Bii.
diff --git a/core/src/main/resources/hudson/model/Messages_ru.properties b/core/src/main/resources/hudson/model/Messages_ru.properties
index b966716ec0..2b0130c8fd 100644
--- a/core/src/main/resources/hudson/model/Messages_ru.properties
+++ b/core/src/main/resources/hudson/model/Messages_ru.properties
@@ -44,12 +44,15 @@ BallColor.Pending=\u041e\u0436\u0438\u0434\u0430\u0435\u0442
 BallColor.Success=\u0423\u0441\u043f\u0435\u0448\u043d\u043e
 BallColor.Unstable=\u041D\u0435\u0441\u0442\u0430\u0431\u0438\u043B\u044C\u043D\u044B\u0439
 
-Computer.Caption=\u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0439 \u0443\u0437\u0435\u043b {0}
 
 Executor.NotAvailable=\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u043e
 
 
 FreeStyleProject.DisplayName=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0437\u0430\u0434\u0430\u0447\u0443 \u0441\u043e \u0441\u0432\u043e\u0431\u043e\u0434\u043d\u043e\u0439 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0435\u0439
+FreeStyleProject.Description=\
+  \u042d\u0442\u043e - \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u0438 \u043d\u0430\u0438\u0431\u043e\u043b\u0435\u0435 \u0443\u043d\u0438\u0432\u0435\u0440\u0441\u0430\u043b\u044c\u043d\u044b\u0439 \u0442\u0438\u043f \u0437\u0430\u0434\u0430\u0447 \u0432 Jenkins. \
+  Jenkins \u0431\u0443\u0434\u0435\u0442 \u0441\u043e\u0431\u0438\u0440\u0430\u0442\u044c \u0432\u0430\u0448 \u043f\u0440\u043e\u0435\u043a\u0442, \u043a\u043e\u043c\u0431\u0438\u043d\u0438\u0440\u0443\u044f \u043b\u044e\u0431\u0443\u044e SCM \u0441 \u043b\u044e\u0431\u043e\u0439 \u0441\u0431\u043e\u0440\u043e\u0447\u043d\u043e\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u043e\u0439. \
+  \u0414\u0430\u043d\u043d\u044b\u0439 \u0442\u0438\u043f \u043f\u0440\u043e\u0435\u043a\u0442\u043e\u0432 \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0434\u043b\u044f \u0437\u0430\u0434\u0430\u0447, \u043e\u0442\u043b\u0438\u0447\u043d\u044b\u0445 \u043e\u0442 \u0441\u0431\u043e\u0440\u043a\u0438 \u041f\u041e.
 
 Hudson.BadPortNumber=\u041d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0439 \u043d\u043e\u043c\u0435\u0440 \u043f\u043e\u0440\u0442\u0430: {0}
 Hudson.Computer.Caption=\u041c\u0430\u0441\u0442\u0435\u0440
@@ -86,14 +89,6 @@ Run.MarkedExplicitly=\u043e\u0442\u043c\u0435\u0447\u0435\u043d\u043e \u0434\u04
 Run.Permissions.Title=\u0417\u0430\u043f\u0443\u0441\u043a
 Run.UnableToDelete=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c {0}: {1}
 
-Slave.InvalidConfig.Executors=\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u043e\u0433\u043e \u0443\u0437\u043b\u0430 {0}. \u041d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435 \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0432.
-Slave.InvalidConfig.NoName=\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u043e\u0433\u043e \u0443\u0437\u043b\u0430. \u0418\u043c\u044f \u0443\u0437\u043b\u0430 \u043f\u0443\u0441\u0442\u043e.
-Slave.InvalidConfig.NoRemoteDir=\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u043e\u0433\u043e \u0443\u0437\u043b\u0430 {0}. \u041d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u043d\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f.
-Slave.Launching={0} \u0417\u0430\u043f\u0443\u0441\u043a \u0430\u0433\u0435\u043d\u0442\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u043e\u0433\u043e \u0443\u0437\u043b\u0430
-Slave.Terminated={0} \u0410\u0433\u0435\u043d\u0442 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u043e\u0433\u043e \u0443\u0437\u043b\u0430 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d
-Slave.UnableToLaunch= \u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0430\u0433\u0435\u043d\u0442\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u043e\u0433\u043e \u0443\u0437\u043b\u0430 {0} {1}
-Slave.UnixSlave=\u0423\u0437\u0435\u043b \u043f\u043e\u0434 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043c Unix
-Slave.WindowsSlave=\u0423\u0437\u0435\u043b \u043f\u043e\u0434 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043c Windows 
 
 View.Permissions.Title=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
 Permalink.LastBuild=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0441\u0431\u043e\u0440\u043a\u0430
diff --git a/core/src/main/resources/hudson/model/Messages_sv_SE.properties b/core/src/main/resources/hudson/model/Messages_sv_SE.properties
index 278c419304..6376d4e09d 100644
--- a/core/src/main/resources/hudson/model/Messages_sv_SE.properties
+++ b/core/src/main/resources/hudson/model/Messages_sv_SE.properties
@@ -5,3 +5,5 @@ Job.Pronoun=Projekt
 
 ManageJenkinsAction.DisplayName=Hantera Jenkins
 ParametersDefinitionProperty.DisplayName=Detta bygge \u00E4r parametriserat
+
+FreeStyleProject.Description=Detta \u00E4r en central del i Jenkins. Jenkins kommer att bygga ditt projekt med valfri versionshanterare och med vilket byggsystem som helst, och detta kan \u00E4ven anv\u00E4ndas f\u00F6r n\u00E5got annat \u00E4n mjukvarubyggen.
diff --git a/core/src/main/resources/hudson/model/Messages_tr.properties b/core/src/main/resources/hudson/model/Messages_tr.properties
index 2d3aaf2179..ee48426b3b 100644
--- a/core/src/main/resources/hudson/model/Messages_tr.properties
+++ b/core/src/main/resources/hudson/model/Messages_tr.properties
@@ -45,12 +45,16 @@ BallColor.Pending=Bekliyor
 BallColor.Success=Ba\u015far\u0131l\u0131
 BallColor.Unstable=Dengesiz
 
-Computer.Caption=Slave {0}
 
 Executor.NotAvailable=Mevcut De\u011fil
 
 
 FreeStyleProject.DisplayName=Serbest-stil yaz\u0131l\u0131m projesi yap\u0131land\u0131r
+FreeStyleProject.Description=\
+  Jenkins''\u0131n merkezi \u00f6zelli\u011fi, projelerinizi yap\u0131land\u0131rman\u0131za yard\u0131m etmesidir. Bu proje t\u00fcr\u00fcn\u00fc kullanarak, \
+  herhangi bir yap\u0131land\u0131rma sistemini herhangi bir Kaynak Kodu Y\u00f6netimi arac\u0131 ile birle\u015ftirebilirsiniz,\
+  ve hatta yaz\u0131l\u0131m yap\u0131land\u0131rman\u0131n d\u0131\u015f\u0131nda ba\u015fka t\u00fcr projeler i\u00e7in dahi kullanabilirsiniz.
+
 
 Hudson.BadPortNumber=Yanl\u0131\u015f Port Numaras\u0131 {0}
 Hudson.Computer.Caption=Master
@@ -87,14 +91,6 @@ Run.MarkedExplicitly=kayd\u0131 tutmak i\u00e7in d\u0131\u015far\u0131dan i\u015
 Run.Permissions.Title=\u00c7al\u0131\u015ft\u0131r
 Run.UnableToDelete={0} silinemiyor: {1}
 
-Slave.InvalidConfig.Executors={0} i\u00e7in ge\u00e7ersiz slave konfig\u00fcrasyonu. Ge\u00e7ersiz yap\u0131land\u0131r\u0131c\u0131 say\u0131s\u0131.
-Slave.InvalidConfig.NoName=Ge\u00e7ersiz slave konfig\u00fcrasyonu. \u0130sim bo\u015f.
-Slave.InvalidConfig.NoRemoteDir={0} i\u00e7in ge\u00e7ersiz slave konfig\u00fcrasyonu. Uzak dizin verilmedi.
-Slave.Launching={0} slave ajan\u0131 \u00e7al\u0131\u015ft\u0131r\u0131yor
-Slave.Terminated={0} slave ajan\u0131 sonland\u0131r\u0131ld\u0131
-Slave.UnableToLaunch={0} y\u00fcz\u00fcnden slave ajan\u0131 \u00e7al\u0131\u015ft\u0131r\u0131lamad\u0131 {1}
-Slave.UnixSlave=Bu bir unix slave
-Slave.WindowsSlave=Bu bir windows slave
 
 View.Permissions.Title=G\u00f6r\u00fcnt\u00fc
 Permalink.LastBuild=Son yap\u0131land\u0131rma
diff --git a/core/src/main/resources/hudson/model/Messages_uk.properties b/core/src/main/resources/hudson/model/Messages_uk.properties
index e48bfb0375..59c4b0bc96 100644
--- a/core/src/main/resources/hudson/model/Messages_uk.properties
+++ b/core/src/main/resources/hudson/model/Messages_uk.properties
@@ -1 +1,3 @@
 ParametersDefinitionProperty.DisplayName=\u0426\u044F \u0431\u0443\u0434\u043E\u0432\u0430 \u043C\u0430\u0454 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438
+
+FreeStyleProject.Description=\u0426\u0435 - \u043E\u0441\u043D\u043E\u0432\u043D\u0430 \u0432\u0456\u0434\u043C\u0456\u043D\u043D\u0456\u0441\u0442\u044C Jenkins. Jenkins \u043F\u043E\u0431\u0443\u0434\u0443\u0454 \u0432\u0430\u0448 \u043F\u0440\u043E\u0435\u043A\u0442, \u043A\u043E\u043C\u0431\u0456\u043D\u0443\u044E\u0447\u0438 \u0431\u0443\u0434\u044C-\u044F\u043A\u0456 \u0441\u0438\u0441\u0442\u0435\u043C\u0438 \u0443\u043F\u0440\u0430\u0432\u043B\u0456\u043D\u043D\u044F \u043A\u043E\u0434\u043E\u043C \u0437 \u0431\u0443\u0434\u044C-\u044F\u043A\u0438\u043C\u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u043C\u0438 \u0437\u0431\u0456\u0440\u043A\u0438, \u0449\u043E \u043C\u043E\u0436\u0435 \u0431\u0443\u0442\u0438 \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u043D\u043E \u043D\u0430\u0432\u0456\u0442\u044C \u0434\u043B\u044F \u0446\u0456\u043B\u0435\u0439 \u0432\u0456\u0434\u043C\u0456\u043D\u043D\u0438\u0445 \u0432\u0456\u0434 \u0437\u0431\u0456\u0440\u043A\u0438 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043D\u043E\u0433\u043E \u0437\u0430\u0431\u0435\u0437\u043F\u0435\u0447\u0435\u043D\u043D\u044F.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Messages_zh_CN.properties b/core/src/main/resources/hudson/model/Messages_zh_CN.properties
index add4006a2c..15d419d1f9 100644
--- a/core/src/main/resources/hudson/model/Messages_zh_CN.properties
+++ b/core/src/main/resources/hudson/model/Messages_zh_CN.properties
@@ -67,20 +67,13 @@ CLI.connect-node.shortDescription=Reconnect to a node
 CLI.online-node.shortDescription=Resume using a node for performing builds, to cancel out the earlier "offline-node" command.
 CLI.offline-node.shortDescription=Stop using a node for performing builds temporarily, until the next "online-node" command.
 
-Computer.Caption=Slave {0}
-Computer.Permissions.Title=Slave
-Computer.ConfigurePermission.Description=This permission allows users to configure slaves.
-Computer.DeletePermission.Description=This permission allows users to delete existing slaves.
-Computer.BadChannel=Slave node offline or not a remote channel (such as master node).
 
-ComputerSet.NoSuchSlave=No such slave: {0}
-ComputerSet.SlaveAlreadyExists=Slave called ''{0}'' already exists
-ComputerSet.SpecifySlaveToCopy=Specify which slave to copy
 ComputerSet.DisplayName=nodes
 Executor.NotAvailable=N/A
 
 
 FreeStyleProject.DisplayName=\u6784\u5efa\u4e00\u4e2a\u81ea\u7531\u98ce\u683c\u7684\u8f6f\u4ef6\u9879\u76ee
+FreeStyleProject.Description=\u8FD9\u662FJenkins\u7684\u4E3B\u8981\u529F\u80FD.Jenkins\u5C06\u4F1A\u7ED3\u5408\u4EFB\u4F55SCM\u548C\u4EFB\u4F55\u6784\u5EFA\u7CFB\u7EDF\u6765\u6784\u5EFA\u4F60\u7684\u9879\u76EE, \u751A\u81F3\u53EF\u4EE5\u6784\u5EFA\u8F6F\u4EF6\u4EE5\u5916\u7684\u7CFB\u7EDF.
 
 HealthReport.EmptyString=
 
@@ -168,16 +161,8 @@ Run.Summary.BrokenSinceThisBuild=broken since this build
 Run.Summary.BrokenSince=broken since build {0}
 Run.Summary.Unknown=?
 
-Slave.InvalidConfig.Executors=Invalid slave configuration for {0}. Invalid # of executors.
-Slave.InvalidConfig.NoName=Invalid slave configuration. Name is empty
-Slave.InvalidConfig.NoRemoteDir=Invalid slave configuration for {0}. No remote directory given
-Slave.Launching={0} Launching slave agent
 Slave.Network.Mounted.File.System.Warning=Are you sure you want to use network mounted file system for FS root? Note that this directory does not need to be visible to the master.
 Slave.Remote.Director.Mandatory=Remote directory is mandatory
-Slave.Terminated={0} slave agent was terminated
-Slave.UnableToLaunch=Unable to launch the slave agent for {0}{1}
-Slave.UnixSlave=This is a Unix slave
-Slave.WindowsSlave=This is a Windows slave
 
 View.Permissions.Title=View
 View.CreatePermission.Description=\
@@ -211,7 +196,6 @@ UpdateCenter.PluginCategory.post-build=Other Post-Build Actions
 UpdateCenter.PluginCategory.report=Build Reports
 UpdateCenter.PluginCategory.scm=Source Code Management
 UpdateCenter.PluginCategory.scm-related=Source Code Management related
-UpdateCenter.PluginCategory.slaves=Slave Launchers and Controllers
 UpdateCenter.PluginCategory.trigger=Build Triggers
 UpdateCenter.PluginCategory.ui=User Interface
 UpdateCenter.PluginCategory.upload=Artifact Uploaders
diff --git a/core/src/main/resources/hudson/model/Messages_zh_TW.properties b/core/src/main/resources/hudson/model/Messages_zh_TW.properties
index 80bb8d071b..9109aa1f54 100644
--- a/core/src/main/resources/hudson/model/Messages_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/Messages_zh_TW.properties
@@ -29,7 +29,6 @@ AbstractBuild.KeptBecause=\u56e0\u70ba {0} \u800c\u4fdd\u7559
 
 AbstractItem.NoSuchJobExists=\u6c92\u6709 ''{0}'' \u4f5c\u696d\u3002\u60a8\u6307\u7684\u662f ''{1}'' \u55ce?
 AbstractItem.Pronoun=\u4f5c\u696d
-AbstractProject.AssignedLabelString_NoMatch_DidYouMean=\u6c92\u6709\u7b26\u5408\u7684\u7bc0\u9ede\u3002\u60a8\u60f3\u7684\u8a72\u4e0d\u6703\u662f ''{1}''\uff0c\u800c\u4e0d\u662f ''{0}'' \u5427?
 AbstractProject.NewBuildForWorkspace=\u6311\u500b\u6642\u9593\u5efa\u7f6e\uff0c\u5c31\u80fd\u7522\u751f\u5de5\u4f5c\u5340\u3002
 AbstractProject.AwaitingBuildForWorkspace=\u7b49\u5019\u5efa\u7f6e\u7522\u51fa\u5de5\u4f5c\u5340\u3002
 AbstractProject.Pronoun=\u5c08\u6848
@@ -61,7 +60,6 @@ AbstractProject.CancelPermission.Description=\
   \u6388\u8207\u53d6\u6d88\u5efa\u7f6e\u7684\u80fd\u529b\u3002
 AbstractProject.AssignedLabelString.InvalidBooleanExpression=\
   \u7121\u6548\u7684\u5e03\u6797\u8868\u793a\u5f0f: {0}
-AbstractProject.AssignedLabelString.NoMatch=\
   \u6c92\u6709\u7b26\u5408\u7684\u7bc0\u9ede
 AbstractProject.CustomWorkspaceEmpty=\u81ea\u8a02\u5de5\u4f5c\u5340\u662f\u7a7a\u7684\u3002
 
@@ -87,19 +85,7 @@ CLI.offline-node.shortDescription=\u66ab\u6642\u4e0d\u4f7f\u7528\u6307\u5b9a\u7b
 CLI.wait-node-online.shortDescription=\u7b49\u5019\u6307\u5b9a\u7bc0\u9ede\u4e0a\u7dda\u3002
 CLI.wait-node-offline.shortDescription=\u7b49\u5019\u6307\u5b9a\u7bc0\u9ede\u96e2\u7dda\u3002
 
-Computer.Caption=Slave {0}
-Computer.NoSuchSlaveExists=\u6c92\u6709 Slave "{0}"\u3002\u60a8\u6307\u7684\u662f "{1}" \u55ce?
-Computer.Permissions.Title=Slave
-Computer.ConfigurePermission.Description=\u6388\u8207\u8a2d\u5b9a Slave \u7684\u6b0a\u9650\u3002
-Computer.DeletePermission.Description=\u6388\u8207\u522a\u9664\u65e2\u6709 Slave \u7684\u6b0a\u9650\u3002
-Computer.CreatePermission.Description=\u6388\u8207\u4f7f\u7528\u8005\u5efa\u7acb Slave \u7684\u6b0a\u9650\u3002
-Computer.ConnectPermission.Description=\u6388\u8207\u4f7f\u7528\u8005\u9023\u7dda\u5230 Slave \u6216\u662f\u5c07\u5176\u8a2d\u70ba\u4e0a\u7dda\u7684\u6b0a\u9650\u3002
-Computer.DisconnectPermission.Description=\u6388\u8207\u4f7f\u7528\u8005\u4e2d\u65b7 Slave \u9023\u7dda\uff0c\u6216\u5c07\u5176\u6a19\u793a\u70ba\u66ab\u6642\u96e2\u7dda\u3002
-Computer.BadChannel=Slave \u7bc0\u9ede\u96e2\u7dda\u6216\u4e0d\u662f\u9060\u7aef\u901a\u9053 (\u4f8b\u5982 Master \u7bc0\u9ede)\u3002
 
-ComputerSet.NoSuchSlave=\u6c92\u6709 Slave: {0}
-ComputerSet.SlaveAlreadyExists=\u5df2\u7d93\u6709\u53eb\u505a ''{0}'' \u7684 Slave \u4e86
-ComputerSet.SpecifySlaveToCopy=\u6307\u5b9a\u8981\u8907\u88fd\u7684 Slave
 ComputerSet.DisplayName=\u7bc0\u9ede
 
 Descriptor.From=(from <a href="{1}">{0}</a>)
@@ -108,6 +94,11 @@ Executor.NotAvailable=N/A
 
 
 FreeStyleProject.DisplayName=\u5efa\u7f6e Free-Style \u8edf\u9ad4\u5c08\u6848
+FreeStyleProject.Description=\
+  \u9019\u662f Jenkins \u7684\u4e3b\u8981\u529f\u80fd\u3002\
+  Jenkins \u80fd\u642d\u914d\u5404\u5f0f\u7a0b\u5f0f\u78bc\u7ba1\u7406\u3001\u5efa\u7f6e\u7cfb\u7d71\u4f86\u5efa\u7f6e\u60a8\u7684\u5c08\u6848\uff0c\
+  \u751a\u81f3\u9084\u80fd\u505a\u8edf\u9ad4\u5efa\u7f6e\u4ee5\u5916\u7684\u5176\u4ed6\u4e8b\u60c5\u3002
+
 
 Hudson.BadPortNumber=\u9023\u63a5\u57e0\u865f {0} \u7121\u6548
 Hudson.Computer.Caption=Master
@@ -211,16 +202,8 @@ Run.Summary.BrokenSinceThisBuild=\u5f9e\u9019\u6b21\u5efa\u7f6e\u958b\u59cb\u721
 Run.Summary.BrokenSince=\u5f9e {0} \u6b21\u5efa\u7f6e\u958b\u59cb\u721b\u4e86
 Run.Summary.Unknown=?
 
-Slave.InvalidConfig.Executors=Slave {0} \u8a2d\u5b9a\u932f\u8aa4\u3002\u57f7\u884c\u7a0b\u5f0f\u6578\u7121\u6548\u3002
-Slave.InvalidConfig.NoName=Slave \u8a2d\u5b9a\u932f\u8aa4\u3002\u6c92\u6709\u6307\u5b9a\u540d\u7a31\u3002
-Slave.InvalidConfig.NoRemoteDir=Slave {0} \u8a2d\u5b9a\u932f\u8aa4\u3002\u6c92\u6709\u6307\u5b9a\u9060\u7aef\u76ee\u9304\u3002
-Slave.Launching={0} \u555f\u52d5 Slave \u4ee3\u7406\u7a0b\u5f0f
 Slave.Network.Mounted.File.System.Warning=\u60a8\u78ba\u5b9a\u8981\u4f7f\u7528\u7db2\u8def\u639b\u8f09\u7684\u6a94\u6848\u7cfb\u7d71\u505a\u70ba\u6839\u76ee\u9304\u55ce? \u9019\u500b\u76ee\u9304 Master \u4e0d\u9700\u8981\u8b93\u76f4\u63a5\u5b58\u53d6\u5594\u3002
 Slave.Remote.Director.Mandatory=\u4e00\u5b9a\u8981\u6307\u5b9a\u9060\u7aef\u76ee\u9304
-Slave.Terminated={0} Slave \u4ee3\u7406\u7a0b\u5f0f\u5df2\u7d50\u675f
-Slave.UnableToLaunch=\u7121\u6cd5\u555f\u52d5 Slave {0} \u7684\u4ee3\u7406\u7a0b\u5f0f{1}
-Slave.UnixSlave=\u9019\u662f Unix slave
-Slave.WindowsSlave=\u9019\u662f Windows slave
 
 View.Permissions.Title=\u8996\u666f
 View.CreatePermission.Description=\
@@ -259,7 +242,6 @@ UpdateCenter.PluginCategory.post-build=\u5176\u4ed6\u5efa\u7f6e\u5f8c\u52d5\u4f5
 UpdateCenter.PluginCategory.report=\u5efa\u7f6e\u5831\u8868
 UpdateCenter.PluginCategory.scm=\u539f\u59cb\u78bc\u7ba1\u7406
 UpdateCenter.PluginCategory.scm-related=\u539f\u59cb\u78bc\u7ba1\u7406\u76f8\u95dc
-UpdateCenter.PluginCategory.slaves=Slave \u555f\u52d5\u53ca\u63a7\u5236\u7a0b\u5f0f
 UpdateCenter.PluginCategory.trigger=\u5efa\u7f6e\u89f8\u767c\u7a0b\u5e8f
 UpdateCenter.PluginCategory.ui=\u4f7f\u7528\u8005\u4ecb\u9762
 UpdateCenter.PluginCategory.upload=\u6210\u54c1\u4e0a\u50b3
diff --git a/core/src/main/resources/hudson/model/Node/help-labelString.html b/core/src/main/resources/hudson/model/Node/help-labelString.html
index d6951e220f..a7cfc252c1 100644
--- a/core/src/main/resources/hudson/model/Node/help-labelString.html
+++ b/core/src/main/resources/hudson/model/Node/help-labelString.html
@@ -1,11 +1,23 @@
 <div>
-  Labels (AKA tags) are used for grouping multiple slaves into one logical group.
-  Use spaces between each label. For instance 'regression java6' will assign a
-  node the labels 'regression' and 'java6'.
-
+  Labels (or tags) are used to group multiple agents into one logical group.
   <p>
-  For example, if you have multiple Windows slaves and you have jobs that require
-  Windows, then you can configure all your Windows slaves to have the label 'windows',
-  then tie the job to the 'windows' label. This allows your job to run on any
-  of your Windows slaves but not on anywhere else. 
-</div>
\ No newline at end of file
+  For example, if you have multiple Windows agents and you have a job that
+  must run on Windows, then you could configure all your Windows agents to have
+  the label <tt>windows</tt>, and then tie that job to this label.
+  <br>
+  This would ensure that your job runs on one of your Windows agents, but not on
+  any agents without this label.
+  <p>
+  Labels do not necessarily have to represent the operating system on the agent;
+  you can also use labels to note the CPU architecture, or that a certain tool
+  is installed on the agent.
+  <p>
+  Multiple labels must be separated by a space. For example,
+  <tt>windows docker</tt> would assign two labels to the agent: <tt>windows</tt>
+  and <tt>docker</tt>.
+  <p>
+  Labels may contain any non-space characters, but you should avoid special
+  characters such as any of these: <tt>!&amp;|&lt;&gt;()</tt>, as other Jenkins
+  features allow for defining label expressions, where these characters may be
+  used.
+</div>
diff --git a/core/src/main/resources/hudson/model/Node/help-labelString_de.html b/core/src/main/resources/hudson/model/Node/help-labelString_de.html
deleted file mode 100644
index 10fc53a877..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-labelString_de.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div>
-  Gruppen (auch: Labels oder Tags) werden benutzt, um mehrere Slave-Knoten in eine
-  logische Gruppe zusammenzufassen. Die Angabe 'regression java6' ordnet beispielsweise
-  einen Knoten den Gruppen 'regression' und 'java6' zu.
-  <p>
-  Beispiel: Sie haben mehrere Slave-Knoten unter Windows und einen Job, der Windows
-  erfordert. Sie können dann alle Ihre Windows-Slave-Knoten unter der Gruppe
-  "windows" zusammenfassen und den Job an die Gruppe "windows" binden.
-  Dadurch kann Ihr Job jedem der Windows-Slave-Knoten zugewiesen werden - aber
-  keinem anderen Slave-Knoten sonst.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Node/help-labelString_pt_BR.html b/core/src/main/resources/hudson/model/Node/help-labelString_pt_BR.html
deleted file mode 100644
index 685874ebc9..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-labelString_pt_BR.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-  Marca&#231;&#245;es tamb&#233;m s&#227;o usadas para agrupar m&#250;ltiplos slaves em um grupo l&#243;gico.
-
-  <p>
-  Por exemplo, se voc&#234; tem m&#250;ltiplos slaves Windows e voc&#234; tem tarefas que requerem
-  Windows, ent&#227;o voc&#234; pode configurar todos seus slaves Windows para ter a marca&#231;&#227;o 'windows',
-  ent&#227;o amarre a tarefa &#224; marca&#231;&#227;o 'windows'. Isto permite que sua tarefa executar apenas
-  nos seus slaves Windows. 
-</div>
diff --git a/core/src/main/resources/hudson/model/Node/help-labelString_tr.html b/core/src/main/resources/hudson/model/Node/help-labelString_tr.html
deleted file mode 100644
index bdd2019e65..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-labelString_tr.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div>
-  Etiketler (di&#287;er ad&#305;yla tag'ler) birden fazla slave'i mant&#305;kl&#305; bir grup i&#231;inde birle&#351;tirmek
-  i&#231;in kullan&#305;l&#305;r.
-
-  <p>
-  Mesela, birden fazla Windows slave'iniz varsa ve baz&#305; i&#351;lerinizin Windows &#252;zerinde &#231;al&#305;&#351;mas&#305;
-  gerekiyorsa, bu durumda Windows slave'lerini 'windows' etiketi ile birle&#351;tirip, &#231;al&#305;&#351;t&#305;rmak
-  istedi&#287;iniz i&#351;e, &#231;al&#305;&#351;aca&#287;&#305; yer olarak 'windows' etiketini vermeniz yeterli olacakt&#305;r.
-  Ayarlar&#305;n&#305;z&#305; bu &#351;ekilde yaparsan&#305;z, istedi&#287;iniz i&#351;ler, windows slave'lerinden ba&#351;ka yerde
-  &#231;al&#305;&#351;t&#305;r&#305;lmayacakt&#305;r.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Node/help-labelString_zh_TW.html b/core/src/main/resources/hudson/model/Node/help-labelString_zh_TW.html
deleted file mode 100644
index 0e3a303930..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-labelString_zh_TW.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-  標籤可以將多個 Slave 進行邏輯分類。
-  不同的標籤之間請以空格隔開。例如 'regression java6' 代表將節點貼上 'regression' 跟 'java6' 兩個標籤。
-
-  <p>
-  舉例來說，如果您有多部 Windows 的 Slave，而且有只能在 Windows 平台上跑的作業，
-  那麼就可以把這些 Windows Slave 標上 'windows' 標籤，並將作業限定成只能在 'windows' 標籤上跑。
-  這麼一來，您的作業就只能在 Windows 的 Slave 上面跑。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Node/help-name.html b/core/src/main/resources/hudson/model/Node/help-name.html
index dd66b5aa64..aa412606d4 100644
--- a/core/src/main/resources/hudson/model/Node/help-name.html
+++ b/core/src/main/resources/hudson/model/Node/help-name.html
@@ -1,7 +1,10 @@
 <div>
-  Name that uniquely identifies a slave within this Jenkins installation.
-
+  Name that uniquely identifies an agent within this Jenkins installation.
   <p>
-  This value could be any string, and doesn't have to be the same as the slave host name,
-  but it's often convenient to make them the same.
+  This does not have to be the same as the agent hostname (where applicable),
+  but it is often convenient to make them the same.
+  <p>
+  The name may not contain any characters from this list:
+  <tt>?*/\%!@#$^&amp;|&lt;&gt;[]:;</tt>
+  <!-- See jenkins.model.Jenkins#checkGoodName -->
 </div>
diff --git a/core/src/main/resources/hudson/model/Node/help-name_de.html b/core/src/main/resources/hudson/model/Node/help-name_de.html
deleted file mode 100644
index ce4e888b20..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-name_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div>
-  Name, der einen Slave-Knoten eindeutig innerhalb dieser Jenkins-Installation identifiziert.
-
-  <p>
-  Dieser Wert kann zwar beliebig gewählt werden und muß nicht zwingend mit dem Rechnernamen
-  des Slave-Knoten übereinstimmen - aber in vielen Fällen ist diese einfache Konvention
-  sehr praktisch.
-</div>
diff --git a/core/src/main/resources/hudson/model/Node/help-name_pt_BR.html b/core/src/main/resources/hudson/model/Node/help-name_pt_BR.html
deleted file mode 100644
index 3be3f19567..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-name_pt_BR.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  Nome que identifica unicamente um slave dentro deste instala&#231;&#227;o do Jenkins.
-
-  <p>
-  Este valor poderia ser qualquer string, e n&#227;o tem que ser o mesmo nome do host slave,
-  mas &#233; conveniente mant&#234;-los iguais.
-</div>
diff --git a/core/src/main/resources/hudson/model/Node/help-name_tr.html b/core/src/main/resources/hudson/model/Node/help-name_tr.html
deleted file mode 100644
index 7aff93778f..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-name_tr.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  &#304;sim, slave'e i&#231;erisinde bulundu&#287;u Jenkins'da belirleyici bir tan&#305;m verir.
-
-  <p>
-  Bu de&#287;er bir string olabilir, ve host ismi ile ayn&#305; olmak zorunda de&#287;ildir, ama anlaml&#305;
-  olmas&#305; i&#231;in ayn&#305; vermek bazen uygun olabilir.
-</div>
diff --git a/core/src/main/resources/hudson/model/Node/help-name_zh_TW.html b/core/src/main/resources/hudson/model/Node/help-name_zh_TW.html
deleted file mode 100644
index 3952c09cdb..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-name_zh_TW.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  在 Jenkins 中能亳無疑問識別出這個 Slave 的名稱。
-
-  <p>
-  名稱可以隨便您取。雖然不一定要是 Slave 的主機名稱，但是設成跟主機名稱一樣會比較方便。
-</div>
diff --git a/core/src/main/resources/hudson/model/Node/help-numExecutors.html b/core/src/main/resources/hudson/model/Node/help-numExecutors.html
index f8dd8a46a9..6e23a37a77 100644
--- a/core/src/main/resources/hudson/model/Node/help-numExecutors.html
+++ b/core/src/main/resources/hudson/model/Node/help-numExecutors.html
@@ -1,15 +1,18 @@
 <div>
-  This controls the number of concurrent builds that Jenkins can perform. So the value
-  affects the overall system load Jenkins may incur.
-  A good value to start with would be the number of processors on your system.
-
+  The maximum number of concurrent builds that Jenkins may perform on this
+  agent.
   <p>
-  Increasing this value beyond that would cause each build to take longer, but it could increase
-  the overall throughput, because it allows CPU to build one project while another build is waiting
-  for I/O.
-
+  A good value to start with would be the number of CPU cores on the machine.
+  Setting a higher value would cause each build to take longer, but could
+  increase the overall throughput. For example, one build might be CPU-bound,
+  while a second build running at the same time might be I/O-bound &mdash; so
+  the second build could take advantage of the spare I/O capacity at that
+  moment.
   <p>
-  When using Jenkins in the master/slave mode, setting this value to 0 would prevent the master
-  from doing any building on its own.  Slaves may not have zero executors, but may be
-  temporarily disabled using the button on the slave's status page.
+  Agents must have at least one executor. To temporarily prevent any builds from
+  being executed on an agent, use the <i>Mark this node temporarily offline</i>
+  button on the agent's page.
+  <p>
+  This does not apply to the Jenkins master &mdash; setting the number of
+  executors to zero will prevent any builds from being executed on the master.
 </div>
diff --git a/core/src/main/resources/hudson/model/Node/help-numExecutors_de.html b/core/src/main/resources/hudson/model/Node/help-numExecutors_de.html
deleted file mode 100644
index f9427704b5..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-numExecutors_de.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div>
-  Diese Einstellung legt die Anzahl gleichzeitiger Build-Prozesse in Jenkins fest.
-  Sie beeinflusst daher die Gesamtlast, die Jenkins auf einem System erzeugen kann.
-  Ein guter Ausgangspunkt wäre die Anzahl der CPUs Ihres Systems.
-  
-  <p>
- 
-  Eine Erhöhung der Anzahl über diesen Wert hinaus würde zunächst die einzelnen Builds
-  verlängern, könnte aber insgesamt den Durchsatz erhöhen, weil es den CPUs erlaubt,
-  an einem Build zu rechnen, während ein anderer Build wegen Ein-/Ausgabeoperationen
-  wartet.
- 
-  <p>
- 
-  Falls Jenkins im Master/Slave-Modus betrieben wird, legt ein Wert von 0 auf dem Master
-  fest, daß ausschließlich auf den Slaves Build-Prozesse durchgeführt werden, nie aber
-  auf dem Master selbst. Slaves müssen mindestens 1 Build-Prozessor bereitstellen, können
-  aber temporär durch eine Schaltfläche auf der Statusseite des Slaves deaktiviert werden.
-</div>
diff --git a/core/src/main/resources/hudson/model/Node/help-numExecutors_pt_BR.html b/core/src/main/resources/hudson/model/Node/help-numExecutors_pt_BR.html
deleted file mode 100644
index 01b4537b2f..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-numExecutors_pt_BR.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-  Isto controla o n&#250;mero de constru&#231;&#245;es concorrentes que o Jenkins pode executar. Assim o valor
-  afeta toda a carga do sistema que o Jenkins pode sustentar.
-  Um bom valor para iniciar seria o n&#250;mero de processadores em seu sistema.
-
-  Aumentando este valor al&#233;m disso pode causar lentid&#227;o na constru&#231;&#227;o, mas tamb&#233;m pode aumentar
-  a capacidade total, porque permite a CPU construir um projeto enquanto uma outra constru&#231;&#227;o
-  est&#225; aguardando por opera&#231;&#227;o de E/S.
-
-  <p>
-  Quando usando o Jenkins no modo master/slave, atribuir este valor a 0 evitar&#225; que o master
-  fa&#231;a qualquer constru&#231;&#227;o nele mesmo.
-</div>
diff --git a/core/src/main/resources/hudson/model/Node/help-numExecutors_tr.html b/core/src/main/resources/hudson/model/Node/help-numExecutors_tr.html
deleted file mode 100644
index cef65e409c..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-numExecutors_tr.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div>
-  Jenkins'&#305;n bu slave &#252;zerinde e&#351; zamanl&#305; ka&#231; tane yap&#305;land&#305;rma y&#252;r&#252;tebilece&#287;ini kontrol eder.
-  Yani, buraya girilecek de&#287;er, Jenkins'&#305;n ne kadar y&#252;ke maruz kalaca&#287;&#305;n&#305; belirler.
-  Ba&#351;lang&#305;&#231; i&#231;in, i&#351;lemci say&#305;s&#305; iyi bir rakam olabilir.
-
-  <p>
-  Bu say&#305;y&#305; art&#305;rmak, yap&#305;land&#305;rmalar&#305;n daha uzun s&#252;rmesine yol a&#231;sa da, toplam &#252;retim kapasitesinde bir
-  art&#305;&#351; sa&#287;layacakt&#305;r, &#231;&#252;nk&#252; bu durum, bir yap&#305;land&#305;rma I/O i&#231;in beklerken, CPU'nun ba&#351;ka bir yap&#305;land&#305;rma
-  ile u&#287;ra&#351;mas&#305;na yol a&#231;acakt&#305;r.
-
-  <p>
-  Bu de&#287;eri 0 yapmak, Jenkins'&#305;n, konfig&#252;rasyonunu kaybetmeden, devre d&#305;&#351;&#305; b&#305;rak&#305;lm&#305;&#351; bir slave'i
-  silmesine olanak tan&#305;r.
-</div>
diff --git a/core/src/main/resources/hudson/model/Node/help-numExecutors_zh_TW.html b/core/src/main/resources/hudson/model/Node/help-numExecutors_zh_TW.html
deleted file mode 100644
index fd7b2ade67..0000000000
--- a/core/src/main/resources/hudson/model/Node/help-numExecutors_zh_TW.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-  控制 Jenkins 可以同時執行的建置數，可能會對 Jenkins 整體負載造成影響。
-  如果不知道該怎麼調整，建議您先設成跟系統處理器數目一樣的值。
-
-  <p>
-  增加這個值可能會讓每一次建置都變慢，但是可以增加整體處理效率。
-  因為專案在等候 I/O 時，CPU 還是能建置其他專案。
-
-  <p>
-  以 Master/Slave 模式使用 Jenkins 時，設定成 0 可以讓 Master 不要自己建置專案。
-  Slave 應該不會半個執行程式都沒有，如果您想要暫時停用該 Slave 的話，可以透過它狀態頁中的按鈕達成。
-</div>
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help.html b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help.html
index a89669c4c5..496799b63e 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help.html
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help.html
@@ -1,14 +1,36 @@
 <div>
-    When you are using Jenkins for various automations, it's sometimes convenient
-    to be able to "parameterize" a build, by requiring a set of user inputs to
-    be made available to the build process. For example, you might be setting up
-    an on-demand test job, where the user can submit a zip file of the binaries to be tested.
-
-    <p>
-    This section configures what parameters your build takes. Parameters are distinguished
-    by their names, and so you can have multiple parameters provided that they have different names.
-
-    <p>
-    See <a  href="http://wiki.jenkins-ci.org/display/JENKINS/Parameterized+Build">the Wiki topic</a>
-    for more discussions about this feature.
+  Parameters allow you to prompt users for one or more inputs that will be
+  passed into a build.  For example, you might have a project that runs tests on
+  demand by allowing users to upload a zip file with binaries to be tested.
+  This could be done by adding a <i>File Parameter</i> here.
+  <br>
+  Or you might have a project that releases some software, and you want users to
+  enter release notes that will be uploaded along with the software. This could
+  be done by adding a <i>Multi-line String Parameter</i> here.
+  <p>
+  Each parameter has a <i>Name</i> and some sort of <i>Value</i>, depending on
+  the parameter type.  These name-value pairs will be exported as environment
+  variables when the build starts, allowing subsequent parts of the build
+  configuration (such as build steps) to access those values, e.g. by using the
+  <tt>${PARAMETER_NAME}</tt> syntax (or <tt>%PARAMETER_NAME%</tt> on Windows).
+  <br>
+  This also implies that each parameter defined here should have a unique
+  <i>Name</i>.
+  <p>
+  When a project is parameterized, the usual <i>Build Now</i> link will be
+  replaced with a <i>Build with Parameters</i> link, where users will be
+  prompted to specify values for each of the defined parameters.  If they choose
+  not to enter anything, the build will start with the default value for each
+  parameter.
+  <p>
+  If a build is started automatically, for example if started by an SCM trigger,
+  the default values for each parameter will be used.
+  <p>
+  When a parameterized build is in the queue, attempting to start another build
+  of the same project will only succeed if the parameter values are different,
+  or if the <i>Execute concurrent builds if necessary</i> option is enabled.
+  <p>
+  See the <a href="https://wiki.jenkins-ci.org/display/JENKINS/Parameterized+Build"
+  target="_blank">Parameterized Builds wiki page</a> for more information about
+  this feature.
 </div>
diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher.jelly b/core/src/main/resources/hudson/model/Slave/help-launcher.jelly
index 7b80362ec3..c9156b09fd 100644
--- a/core/src/main/resources/hudson/model/Slave/help-launcher.jelly
+++ b/core/src/main/resources/hudson/model/Slave/help-launcher.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:ajax>
     <div>
-      ${%Controls how Jenkins starts this slave.}
+      ${%Controls how Jenkins starts this agent.}
 
       <dl>
         <j:forEach var="d" items="${h.getComputerLauncherDescriptors()}">
diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_da.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_da.properties
deleted file mode 100644
index 15f2e396ca..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-launcher_da.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Controls\ how\ Jenkins\ starts\ this\ slave.=Styrer hvordan Jenkins starter denne slave.
diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_de.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_de.properties
deleted file mode 100644
index dc586b7e4b..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-launcher_de.properties
+++ /dev/null
@@ -1 +0,0 @@
-Controls\ how\ Jenkins\ starts\ this\ slave.=Steuert, wie Jenkins den Slave-Knoten startet.
diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_es.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_es.properties
index bb2e5e2309..94f86e708e 100644
--- a/core/src/main/resources/hudson/model/Slave/help-launcher_es.properties
+++ b/core/src/main/resources/hudson/model/Slave/help-launcher_es.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Controls\ how\ Jenkins\ starts\ this\ slave.=Controla c�mo Jenkins inicia este esclavo.
+Controls\ how\ Jenkins\ starts\ this\ agent.=Controla como Jenkins inicia este agente.
diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_fr.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_fr.properties
deleted file mode 100644
index bf30272406..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-launcher_fr.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Alan Harder, Eric Lefevre-Ardant
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Controls\ how\ Jenkins\ starts\ this\ slave.=Contr�le la fa�on dont Jenkins d�marre l''esclave.
diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_ja.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_ja.properties
deleted file mode 100644
index 55ed67ea5f..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-launcher_ja.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Controls\ how\ Jenkins\ starts\ this\ slave.=\u3053\u306E\u30B9\u30EC\u30FC\u30D6\u306E\u8D77\u52D5\u65B9\u6CD5\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002
diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties
deleted file mode 100644
index d02da19515..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Controls\ how\ Jenkins\ starts\ this\ slave.=Controla como o Jenkins inicia esse slave
diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_tr.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_tr.properties
deleted file mode 100644
index c897a4126f..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-launcher_tr.properties
+++ /dev/null
@@ -1 +0,0 @@
-Controls\ how\ Jenkins\ starts\ this\ slave.= Jenkins'?n slave'i nas?l ba?lataca??n? kontrol eder. 
diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_zh_TW.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_zh_TW.properties
deleted file mode 100644
index 53d4c8d021..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-launcher_zh_TW.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Controls\ how\ Jenkins\ starts\ this\ slave.=\u63a7\u5236 Jenkins \u4f7f\u7528\u4ec0\u9ebc\u65b9\u5f0f\u555f\u52d5 Slave\u3002
diff --git a/core/src/main/resources/hudson/model/Slave/help-remoteFS.html b/core/src/main/resources/hudson/model/Slave/help-remoteFS.html
index 477c19c6a0..6915c41fb3 100644
--- a/core/src/main/resources/hudson/model/Slave/help-remoteFS.html
+++ b/core/src/main/resources/hudson/model/Slave/help-remoteFS.html
@@ -1,36 +1,34 @@
 <div>
   <p>
-  A slave needs to have a directory dedicated to Jenkins. Specify
-  the  path of this work directory on the slave. It is best to use
-  an absolute path, such as '/var/jenkins' or 'c:\jenkins'. This
-  should be a path local to the slave machine. There's no need for
-  this path to be visible from the master, under normal circumstances.
-
+  An agent needs to have a directory dedicated to Jenkins. Specify
+  the path to this directory on the agent. It is best to use
+  an absolute path, such as <tt>/var/jenkins</tt> or <tt>c:\jenkins</tt>.
+  This should be a path local to the agent machine. There is no need for
+  this path to be visible from the master.
   <p>
-  Slaves do not maintain important data (other than active workspaces
-  of projects last built on it), so you can possibly set the slave
-  workspace to a temporary directory. The only downside of doing this
-  is that you may lose the up-to-date workspace if the slave is turned off.
-
+  Agents do not maintain important data; all job configurations, build logs and
+  artifacts are stored on the master, so it would be possible to use a temporary
+  directory as the agent root directory.
+  <br>
+  However, by giving an agent a directory that is not deleted after a machine
+  reboot, for example, the agent can cache data such as tool installations, or
+  build workspaces. This prevents unnecessary downloading of tools, or checking
+  out source code again when builds start to run on this agent again after a
+  reboot.
   <p>
-  If you use a relative path, such as './jenkins-slave', the path will
-  be relative to the current working directory that the launcher provides.
+  If you use a relative path, such as <tt>./jenkins-agent</tt>, the path will be
+  relative to the working directory provided by the <i>Launch method</i>.
   <ul>
-  <li>For launchers where Jenkins controls starting the slave process, such
+  <li>For launchers where Jenkins controls starting the agent process, such
   as SSH, the current working directory will typically be consistent,
-  <i>e.g.</i> the user's home directory. This means that Jenkins will be able to
-  rely on the caching of tool installations and workspaces from previous
-  builds.
-  </li>
-  <li>For launchers where Jenkins has no control over starting the slave
+  e.g. the user's home directory.</li>
+  <li>For launchers where Jenkins has no control over starting the agent
   process, such as JNLP when launched from either the command line or via
   a web browser link, the current working directory may change between
-  launches of the slave and use of a relative path may prove problematic.
+  launches of the agent and use of a relative path may prove problematic.
+  <br>
   The principal issue encountered when using relative paths with launchers
   like JNLP is the proliferation of stale workspaces and tool installation
-  on the slave machine. This can cause disk space issues.
-  <i>Note: there are some cloud providers that specifically use relative
-  paths with the JNLP launcher to allow for dynamically provisioned pools
-  of semi-heterogeneous slaves.</i></li>
+  on the agent machine. This can cause disk space issues.</li>
   </ul>
 </div>
diff --git a/core/src/main/resources/hudson/model/Slave/help-remoteFS_de.html b/core/src/main/resources/hudson/model/Slave/help-remoteFS_de.html
deleted file mode 100644
index e507e71842..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-remoteFS_de.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div>
-  <p>
-  Ein Slave-Knoten benötigt ein Verzeichnis, das Jenkins exklusiv 
-  zur Verfügung steht. Geben Sie den absoluten Pfad dieses
-  Arbeitsverzeichnisses auf dem Slave-Knoten an, z.B. 
-  '/export/home/jenkins' oder 'c:\jenkins'. Dieses Verzeichnis muß unter normalen
-  Umständen nicht vom Master aus erreichbar sein.
-
-  <p>
-  Slave-Knoten speichern keine wichtigen Daten (abgesehen von den 
-  aktiven Arbeitsbereichen derjenigen Projekte, die zuletzt auf dem
-  Slave-Knoten gebaut wurden). Sie können daher gefahrlos das Slave-Arbeitsverzeichnis
-  auf ein temporäres Verzeichnis setzen. Der einzige Nachteil dieses Vorgehens
-  wäre der Verlust der aktuellen Arbeitsbereiche, falls der Slave-Knoten
-  abgeschaltet würde.
-</div>
diff --git a/core/src/main/resources/hudson/model/Slave/help-remoteFS_pt_BR.html b/core/src/main/resources/hudson/model/Slave/help-remoteFS_pt_BR.html
deleted file mode 100644
index 5f995b42e9..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-remoteFS_pt_BR.html
+++ /dev/null
@@ -1,13 +0,0 @@
-div>
-    <!-- OUTDATED -->
-  <p>
-  Um slave precisa ter um diret&#243;rio dedicado ao Jenkins. Especifique
-  o caminho absoluto deste diret&#243;rio de trabalho no slave, tal como
-  '/export/home/jenkins'.
-
-  <p>
-  Slaves n&#227;o mant&#233;m dados importantes (al&#233;m dos workspaces ativos
-  dos &#250;ltimos projetos constru&#237;dos neles), assim voc&#234; pode configurar o 
-  workspace do slave para um diret&#243;rio tempor&#225;rio. A &#250;nica desvantagem de fazer isto
-  &#233; que voc&#234; pode perder o workspace atualizado se o slave for desligado.
-</div>
diff --git a/core/src/main/resources/hudson/model/Slave/help-remoteFS_tr.html b/core/src/main/resources/hudson/model/Slave/help-remoteFS_tr.html
deleted file mode 100644
index 19357e537b..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-remoteFS_tr.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div>
-    <!-- OUTDATED -->
-  <p>
-  Slave'in &#252;zerinde bir dizini, Jenkins'&#305;n kullan&#305;m&#305; i&#231;in ay&#305;rman&#305;z
-  gerekmektedir. Bu alana, bu dizinin mutlak yolunu yazman&#305;z gerekir
-  ('/export/home/jenkins' gibi). Bu dizinin yolu slave makineye g&#246;redirr. Normal &#351;artlar alt&#305;nda master taraf&#305;ndan
-  g&#246;r&#252;n&#252;r olmas&#305;na gerek yoktur.
-
-  <p>
-  Slave'ler &#231;ok &#246;nemli veriler olu&#351;turmazlar (&#252;zerinde &#231;al&#305;&#351;an projelerin
-  aktif &#231;al&#305;&#351;ma alanlar&#305; d&#305;&#351;&#305;nda). Dolay&#305;s&#305;yla, slave'in &#231;al&#305;&#351;ma alan&#305;, ge&#231;ici
-  bir dizine ayarlanabilir. Bu &#351;ekilde yapman&#305;n tek dezavantaj&#305;, slave &#231;evrim
-  d&#305;&#351;&#305; oldu&#287;unda, g&#252;ncel &#231;al&#305;&#351;ma alan&#305;n&#305; kaybedebilecek olman&#305;zd&#305;r.
-</div>
diff --git a/core/src/main/resources/hudson/model/Slave/help-remoteFS_zh_TW.html b/core/src/main/resources/hudson/model/Slave/help-remoteFS_zh_TW.html
deleted file mode 100644
index ff327c4bdd..0000000000
--- a/core/src/main/resources/hudson/model/Slave/help-remoteFS_zh_TW.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-  <p>
-  Slave 上要有 Jenkins 專用的目錄。
-  請指定這個工作目錄在 Slave 上的完整路徑，例如 '/var/jenkins' 或是 'c:\jenkins'。
-  Master 不用直接存取到這個路徑。
-
-  <p>
-  Slave 上不會儲存重要資訊 (只會存最近建置專案的工作區)，所以您也可以把 Slave 工作區設在暫存目錄裡。
-  唯一的缺點是當 Slave 停掉時，您可能會看不到工作區的最新內容。
-</div>
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly b/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly
index 3880cfa74c..5f9d40194f 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
     <l:tasks>
       <l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
       <l:isAdmin>
-        <l:task href="${rootURL}/manage" icon="icon-setting icon-md" title="${%Manage Jenkins}"/>
+        <l:task href="${rootURL}/manage" icon="icon-gear2 icon-md" title="${%Manage Jenkins}"/>
         <l:task href="${rootURL}/pluginManager/" icon="icon-plugin icon-lg" title="${%Manage Plugins}"/>
       </l:isAdmin>
     </l:tasks>
diff --git a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html
index 2b56cc86ac..37b1e5cc65 100644
--- a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html
+++ b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html
@@ -8,7 +8,7 @@
 
     <ul>
     <li>Your Jenkins version
-    <li>For your master and each slave, OS type, and # of executors
+    <li>For your master and each agent, OS type, and # of executors
     <li>Plugins that are installed and their versions
     <li>Number of jobs per each job type in your Jenkins
     </ul>
diff --git a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_de.html b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_de.html
deleted file mode 100644
index f3229055b6..0000000000
--- a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_de.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div>
-    Zu wissen, wie Jenkins genutzt wird, ist ungemein hilfreich, wenn es um die Richtung der
-    Weiterentwicklung geht - insbesondere bei OpenSource-Projekten, bei denen die Anwender
-    nicht genau bekannt sind. Wenn angewählt, sendet Jenkins in Abständen Informationen über
-    die Nutzung dieser Instanz. 
-    <p>
-    Diese Informationen umfassen ausschließlich:
-    <ul>
-    <li>Ihre Jenkins-Version</li>
-    <li>Für jeden Master- und Slave-Knoten: Betriebssystem und Anzahl der Build-Prozessoren</li>
-    <li>Installierte Plugins und deren Version</li>
-    <li>Anzahl per angelegten Jobs pro Jobtyp</li>
-    </ul>
-
-    <p>
-    Diese Informationen enthalten nichts, was Sie identifiziert oder uns erlauben könnte,
-    mit Ihnen in Kontakt zu treten (außer Daten, die inhärent bei HTTP übermittelt werden,
-    wie beispielsweise IP-Adressen). Diese Daten werden in zusammengefasster Form als
-    Nutzungsstatistiken der Jenkins-Community zur Verfügung gestellt.
- 
-    <p>
-    Lesen Sie die <a href="http://jenkins.361315.n4.nabble.com/request-for-comments-tracking-usage-metrics-td375557.html">
-    Diskussion dieser Funktion in der Jenkins-Community</a> - und steuern Sie gerne Ihre Meinung dazu bei!
-</div>
diff --git a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_zh_TW.html b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_zh_TW.html
deleted file mode 100644
index 65e59953f2..0000000000
--- a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_zh_TW.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div>
-    知道大家怎麼使用 Jenkins 對發展方向有很大的助益，開放原始碼專案向來都很難追蹤使用族群。
-    啟用這個選項後，Jenkins 會定期將您的 Jenkins 使用狀況傳送回去。
-
-    <p>
-    明確來說，會送出的資訊有:
-
-    <ul>
-    <li>您的 Jenkins 版本
-    <li>Master 及 Slave 的作業系統類型，以及執行程式數
-    <li>安裝的外掛程式名稱及其版本
-    <li>Jenkins 中不同作業類型的作業數
-    </ul>
-
-    <p>
-    資訊中不會有任何可以認出您，或是能讓我們聯絡到您的資訊
-    (除了 HTTP 中無可避免會揭露的 IP 位址等資訊)。送出的使用狀況統計資料表內容會與整個社群共享。
-
-    <p>
-    您可以看看<a href="http://jenkins.361315.n4.nabble.com/request-for-comments-tracking-usage-metrics-td375557.html">
-    這個機制的社群討論內容</a>，也歡迎您提出建言。
-</div>
diff --git a/core/src/main/resources/hudson/model/User/sidepanel.jelly b/core/src/main/resources/hudson/model/User/sidepanel.jelly
index 126bdae5d8..46bad7a605 100644
--- a/core/src/main/resources/hudson/model/User/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/User/sidepanel.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
       <l:task contextMenu="false" href="${rootURL}/asynchPeople/" icon="icon-up icon-md" title="${%People}"/>
       <l:task contextMenu="false" href="${rootURL}/${it.url}/" icon="icon-search icon-md" title="${%Status}"/>
       <l:task href="${rootURL}/${it.url}/builds" icon="icon-notepad icon-md" title="${%Builds}"/>
-      <l:task href="${rootURL}/${it.url}/configure" icon="icon-setting icon-md" permission="${app.ADMINISTER}" title="${%Configure}"/>
+      <l:task href="${rootURL}/${it.url}/configure" icon="icon-gear2 icon-md" permission="${app.ADMINISTER}" title="${%Configure}"/>
       <t:actions actions="${it.propertyActions}"/>
       <t:actions actions="${it.transientActions}"/>
       <j:if test="${it.canDelete()}">
diff --git a/core/src/main/resources/hudson/model/View/newJob.jelly b/core/src/main/resources/hudson/model/View/newJob.jelly
index ba6ae05161..c37a22c836 100644
--- a/core/src/main/resources/hudson/model/View/newJob.jelly
+++ b/core/src/main/resources/hudson/model/View/newJob.jelly
@@ -22,20 +22,54 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<!--
-  "New Project" page.
--->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <j:getStatic var="permission" className="hudson.model.Item" field="CREATE"/>
-  <l:layout norefresh="true" permission="${permission}" title="${%NewJob(it.newPronoun)}">
-    <st:include page="sidepanel.jelly" />
+
+  <l:layout norefresh="true" cssclass="main-panel-only" permission="${permission}" title="${%NewJob(it.newPronoun)}">
+
+    <l:js src="jsbundles/add-item.js" />
+    <l:css src="jsbundles/add-item.css" />
+
     <l:main-panel>
-      <j:invokeStatic var="jobs" className="hudson.model.Items" method="all">
-        <j:arg type="hudson.model.ItemGroup" value="${it.ownerItemGroup}"/>
-      </j:invokeStatic>
-      <n:form nameTitle="${%JobName(it.newPronoun)}" copyTitle="${%CopyExisting(it.newPronoun)}" showCopyOption="${!empty(app.itemMap)}"
-              descriptors="${jobs}" checkUrl="${rootURL}/checkJobName" xmlns:n="/lib/hudson/newFromList" />
+      <div id="add-item-panel" style="display: none;">
+        <form method="post" action="createItem" name="createItem" id="createItem">
+          <div class="header">
+            <div class="add-item-name">
+              <label for="name">${%ItemName.label}</label>
+              <input name="name" id="name" type="text" />
+              <div class="input-help">&#187; ${%ItemName.help}</div>
+              <div id="itemname-required" class="input-validation-message input-message-disabled">&#187; ${%ItemName.validation.required}</div>
+              <div id="itemname-invalid" class="input-validation-message input-message-disabled"></div>
+              <div id="itemtype-required" class="input-validation-message input-message-disabled">&#187; ${%ItemType.validation.required}</div>
+            </div>
+          </div>
+
+          <div class="categories flat" />
+
+          <j:if test="${!empty(app.itemMap)}">
+            <div class="item-copy">
+              <p class="description">${%CopyOption.description}:</p>
+              <div class="add-item-copy">
+                <input type="radio" name="mode" value="copy" />
+                <div class="icon">
+                  <img src="${resURL}/images/48x48/copy.png" />
+                </div>
+                <label>${%CopyOption.label}</label>
+                <j:set var="descriptor" value="${it.descriptor}" />
+                <s:textbox id="from" name="from" placeholder="${%CopyOption.placeholder}" field="copyNewItemFrom"/>
+              </div>
+            </div>
+          </j:if>
+
+          <div class="footer">
+            <div class="btn-decorator">
+              <button type="submit" id="ok-button">OK</button>
+            </div>
+          </div>
+        </form>
+      </div>
+
     </l:main-panel>
   </l:layout>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/View/newJob.properties b/core/src/main/resources/hudson/model/View/newJob.properties
index 2b841de29e..888f5bb4d6 100644
--- a/core/src/main/resources/hudson/model/View/newJob.properties
+++ b/core/src/main/resources/hudson/model/View/newJob.properties
@@ -1,3 +1,11 @@
 NewJob=New {0}
 JobName={0} name
+ItemName.help=Required field
+ItemName.label=Enter an item name
+ItemName.validation.required=This field cannot be empty. Please enter a valid name and press OK button.
+ItemType.validation.required=Please select an item type
+CopyOption.placeholder=Type to autocomplete
+CopyOption.description=if you want to create a new item from other existing, you can use this option
+CopyOption.label=Copy from
 CopyExisting=Copy existing {0}
+
diff --git a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold.html b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold.html
index e3c7ce0d8e..3bc40d8cc7 100644
--- a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold.html
+++ b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold.html
@@ -1,5 +1,5 @@
 <div>
     This option configures the amount of minimum amount of free disk space
-    desired for a slave's proper operation, such as "1.5GB", "100KB", etc.
-    If a slave is found to have less free disk space than this amount, it will be marked offline.
+    desired for an agent's proper operation, such as "1.5GB", "100KB", etc.
+    If an agent is found to have less free disk space than this amount, it will be marked offline.
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold_de.html b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold_de.html
deleted file mode 100644
index 1478dd66d0..0000000000
--- a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold_de.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-    Diese Option legt die Mindestgrenze für den freien Plattenplatz fest,
-    den ein Slave-Knoten zur korrekten Ausführung benötigt, z.B. "1.5GB", "100KB".
-    Unterschreitet der freie Plattenplatz eines Slave-Knotens diese Grenze, wird er
-    offline genommen.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold_zh_TW.html b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold_zh_TW.html
deleted file mode 100644
index fa7db9b713..0000000000
--- a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/help-freeSpaceThreshold_zh_TW.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-    這個選項設定能讓 Slave 正常運作的最小可用磁碟空間，例如 "1.5GB", "100KB"...。
-    一旦發現 Slave 可用磁碟空間小於這個值，就會將它標示為離線。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help.html b/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help.html
index aab9bec30e..c25399638b 100644
--- a/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help.html
+++ b/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help.html
@@ -1,3 +1,3 @@
 <div>
-    This monitor just shows the architecture of the slave for your information. It never marks the slave offline.
+    This monitor just shows the architecture of the agent for your information. It never marks the agent offline.
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help_de.html b/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help_de.html
deleted file mode 100644
index 635d1ec1e3..0000000000
--- a/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help_de.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  Zeigt lediglich zur Information das Betriebssystem eines Slaves an.
-  Diese Anzeige beeinflusst niemals den Online/Offline-Status eines Slaves.
-</div>
diff --git a/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help_zh_TW.html b/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help_zh_TW.html
deleted file mode 100644
index ea3610ef33..0000000000
--- a/core/src/main/resources/hudson/node_monitors/ArchitectureMonitor/help_zh_TW.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-    這個監控程式單純顯示 Slave 架構資訊供您參考。不會將 Slave 標為離線。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/ClockMonitor/help_de.html b/core/src/main/resources/hudson/node_monitors/ClockMonitor/help_de.html
deleted file mode 100644
index 43f8cdd7b7..0000000000
--- a/core/src/main/resources/hudson/node_monitors/ClockMonitor/help_de.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-    Überwacht die Zeitdifferenz zwischen dem Master und den Slaves.
-    Obwohl Jenkins mit zeitlichen Differenzen zwischen Rechnern zurechtkommt,
-    neigen Versionsmanagementsysteme und verteilte Dateizugriffe unter diesen
-    Umständen zu merkwürdigen Problemen. 
-    
-    <p>
-    Um Uhren auf mehreren Rechnern synchron zu halten, ziehen Sie NTP im Betracht.
-</div>
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help.html b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help.html
index cecca0e087..d714c0e184 100644
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help.html
+++ b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help.html
@@ -1,6 +1,6 @@
 <div>
-    This monitors the available disk space of <tt>$JENKINS_HOME</tt> on each slave, and if it gets below
-    a threshold, the slave will be marked offline.
+    This monitors the available disk space of <tt>$JENKINS_HOME</tt> on each agent, and if it gets below
+    a threshold, the agent will be marked offline.
 
     <p>
     This directory is where all your builds are performed, so if it fills up, all the builds will fail.
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help_de.html b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help_de.html
deleted file mode 100644
index ed2cbfdca3..0000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div>
-    Überwacht den freien Festplattenplatz in <tt>$JENKINS_HOME</tt> auf jedem Slave. 
-    Unterschreitet der freie Platz eine bestimmte Schwelle, so wird der Slave offline genommen.
-
-    <p>
-    In diesem Verzeichnis <tt>$JENKINS_HOME</tt> finden alle Builds statt, so daß ein
-    volles Verzeichnis Builds scheitern lässt.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help_zh_TW.html b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help_zh_TW.html
deleted file mode 100644
index 510d169fa3..0000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/help_zh_TW.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-    監控每個 Slave 的 <tt>$JENKINS_HOME</tt> 可用磁碟空間，低於臨界值的 Slave 會被標為離線。
-
-    <p>
-    所有建置都在這個目錄裡執行。如果滿了，接下來的建置都會失敗。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_de.properties b/core/src/main/resources/hudson/node_monitors/Messages_de.properties
index 704bc5835b..6bc58ba7ef 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_de.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_de.properties
@@ -25,7 +25,6 @@ ClockMonitor.DisplayName=Zeitdifferenz
 DiskSpaceMonitor.DisplayName=Freier Plattenplatz
 DiskSpaceMonitor.MarkedOffline=Nehme {0} tempor�r offline, da der Festplattenplatz knapp geworden ist.
 ResponseTimeMonitor.DisplayName=Antwortzeit
-ResponseTimeMonitor.MarkedOffline=Nehme {0} tempor�r offline, weil Slave nicht antwortet.
 ResponseTimeMonitor.TimeOut= {0} mal keine Antwort
 SwapSpaceMonitor.DisplayName=Freier Swap Space
 TemporarySpaceMonitor.DisplayName=Freier TEMP-Platz
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.properties
index d3e7535290..8df89a9341 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.properties
@@ -1,3 +1,3 @@
-blurb=Jenkins took some slaves offline because <a href="{0}/computer/">their key health metrics</a> went below a threshold. \
+blurb=Jenkins took some agents offline because <a href="{0}/computer/">their key health metrics</a> went below a threshold. \
   If you don\u2019t want Jenkins to do this, \
   <a href="{0}/computer/configure">change the setting</a>. 
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_cs.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_cs.properties
index 030be99a69..633d58b85a 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_cs.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_cs.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
 Dismiss=Zru\u0161it
-blurb=Jenkins nastavil n\u011Bkter\u00E9 slave-y do offline m\u00F3du <a href="{0}/computer/">jejich stav</a> se zhor\u0161il. Pokud nechcete, aby to Jenkins d\u011Blal, <a href="{0}/computer/configure">zm\u011B\u0148te tohle nastaven\u00ED</a>. 
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_da.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_da.properties
index aa98019f19..d2e887bc0b 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_da.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_da.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
  
-blurb=Jenkins tog nogle slaver offline, da <a href="{0}/computer/">deres helbredsparametre</a> kom under en t\u00e6rskelv\u00e6rdi.
 Dismiss=Luk
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_de.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_de.properties
index 8616095243..99e9e6fccd 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_de.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_de.properties
@@ -1,5 +1 @@
-blurb=\
-  Jenkins hat einige Slaves offline genommen, da deren <a href="{0}/computer/">Gesundheitszustand</a> \
-  eine bestimmte Schwelle unterschritten hatte. Wenn Sie nicht m�chten, da� Jenkins dies vornimmt, \
-  k�nnen Sie die <a href="{0}/computer/configure">Konfiguration �ndern</a>.
 Dismiss=Schlie�en
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_es.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_es.properties
index 30c2e223f9..79e2f8cb96 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_es.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_es.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=Jenkins puso alg�n esclavo fuera de l�nea porque <a href="{0}/computer/">su estado de disponibilidad</a> \
+blurb=Jenkins puso alg�n agente fuera de l�nea porque <a href="{0}/computer/">su estado de disponibilidad</a> \
   ha bajado por debajo e un umbral. Si quieres que Jenkins no haga �sto,  <a href="{0}/computer/configure">cambia la configuraci�n.</a>.
 Dismiss=Descartar
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_fr.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_fr.properties
index f5a6f9ba1e..9cb007a1fe 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_fr.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_fr.properties
@@ -21,5 +21,4 @@
 # THE SOFTWARE.
 
 Dismiss=Cacher
-blurb=Jenkins a mis hors ligne des esclaves <a href="{0}/computer/">leur m\u00E9triques d''\u00E9tat de sant\u00E9</a> \u00E9taient sous les exigences. Si vous ne voulez pas que Jenkins face cela, vous pouvez <a href="{0}/computer/configure">changer la configuration</a>.
 
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_ja.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_ja.properties
index c6193420e5..703a560539 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_ja.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_ja.properties
@@ -20,7 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=\
-  <a href="{0}/computer/">\u30B9\u30EC\u30FC\u30D6\u306E\u72B6\u614B</a>\u304C\u95BE\u5024\u3092\u4E0B\u56DE\u3063\u305F\u305F\u3081\u3001\u30B9\u30EC\u30FC\u30D6\u3092\u30AA\u30D5\u30E9\u30A4\u30F3\u306B\u3057\u307E\u3057\u305F\u3002\
-  \u30AA\u30D5\u30E9\u30A4\u30F3\u306B\u3057\u306A\u3044\u3088\u3046\u306B\u3059\u308B\u306B\u306F\u3001<a href="{0}/computer/configure">\u8A2D\u5B9A\u3092\u5909\u66F4\u3057\u3066\u304F\u3060\u3055\u3044</a>\u3002
-Dismiss=\u7121\u8996
\ No newline at end of file
+Dismiss=\u7121\u8996
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties
index e6c3c92bd9..91e4c21a6b 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties
@@ -21,7 +21,4 @@
 # THE SOFTWARE.
 
 Dismiss=Dispensar
-blurb=O Jenkins deixou alguns slaves offlineporque a href="{0}/computer/">suas m\u00e9tricas </a> estavam abaixo do limite. \ 
- Se voc\u00ea n\u00e3o quiser que o Jenkins fa\u00e7a isso, \ 
- <a href="{0}/computer/configure">mude a configura\u00e7\u00e3o</a>. 
 
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt_BR.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt_BR.properties
index 93ba752157..81af812fd2 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt_BR.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt_BR.properties
@@ -21,10 +21,3 @@
 # THE SOFTWARE.
 
 Dismiss=
-# Jenkins took some slaves offline because <a href="{0}/computer/">their key health metrics</a> went below a threshold. \ 
-# If you don''t want Jenkins to do this, \ 
-# <a href="{0}/computer/configure">change the setting</a>. 
-blurb=Jenkins colocou alguns slaves offline porque <a href="{0}/computer/">sua m\u00e9tricas</a> est\u00e3o abaixo do esperado.\
-	Se voc\u00ea n\u00e3o quer que o Jenkins fa\u00e7a mais isso,\
-	<a href="{0}/computer/configure">mude suas configura\u00e7\u00f5es</a>. 
-g</a>. 
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_sv_SE.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_sv_SE.properties
index f493a75eb9..e8eef30b21 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_sv_SE.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_sv_SE.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
 Dismiss=Avvisa
-blurb=Jenkins st\u00E4ngde ned slavprocesser vars <a href="{0}/computer/">nyckelv\u00E4rde f\u00F6r systemh\u00E4lsa</a> g\u00E5tt under deras gr\u00E4nsv\u00E4rde. Om du inte vill att Jenkins ska g\u00F6ra det i forts\u00E4ttningen, <a href="{0}/computer/configure">\u00E4ndra i inst\u00E4llningarna</a>.
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_zh_CN.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_zh_CN.properties
index 61e902bdca..89f20d137b 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_zh_CN.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_zh_CN.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
 Dismiss=\u5FFD\u7565
-blurb=Jenkins\u4F1A\u8BA9<a href="{0}/computer/">\u5065\u5EB7\u6570\u636E</a> \u4F4E\u4E8E\u4E34\u754C\u503C\u7684slaves \u673A\u5668\u79BB\u7EBF \u3002\u5982\u679C\u4F60\u4E0D\u5E0C\u671B Jenkins \u8FD9\u6837\u505A\uFF0C \u8BF7<a href="{0}/computer/configure">\u66F4\u6539\u8BBE\u7F6E</a>. 
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_zh_TW.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_zh_TW.properties
index b124c61599..3a970b7399 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_zh_TW.properties
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_zh_TW.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=Jenkins \u5C07\u90E8\u5206 Slave \u8A2D\u70BA\u96E2\u7DDA\uFF0C\u56E0\u70BA<a href="{0}/computer/">\u5B83\u5011\u7684\u5065\u5EB7\u8861\u91CF\u6A19\u6E96</a>\u5DF2\u7D93\u4F4E\u65BC\u81E8\u754C\u503C\u3002\u5982\u679C\u4F60\u89BA\u5F97 Jenkins \u592A\u96DE\u5A46\uFF0C<a href="{0}/computer/configure">\u8ACB\u4FEE\u6539\u8A2D\u5B9A</a>\u3002
 Dismiss=\u89E3\u9664
diff --git a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help.html b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help.html
index 366e1d9633..5a6f27a412 100644
--- a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help.html
+++ b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help.html
@@ -1,9 +1,9 @@
 <div>
-    This monitors the round trip network response time from the master to the slave, and if it
-    goes above a threshold repeatedly, it marks the slave offline.
+    This monitors the round trip network response time from the master to the agent, and if it
+    goes above a threshold repeatedly, it marks the agent offline.
 
     <p>
-    This is useful for detecting unresponsive slaves, or other network problems that clog the
-    communication channel. More specifically, the master sends a no-op command to the slave,
+    This is useful for detecting unresponsive agents, or other network problems that clog the
+    communication channel. More specifically, the master sends a no-op command to the agent,
     and checks the time it takes to get back the result of this no-op command.
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help_de.html b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help_de.html
deleted file mode 100644
index a86c7c2f8e..0000000000
--- a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help_de.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-   Misst die Laufzeit vom Master zum Slave und zurück. Überschreitet die Laufzeit
-   wiederholt einen Schwellwert, so wird der Slave offline genommen.
-
-    <p>
-   Dies ist nützlich, um abgestürzte Slaves auszumachen oder Netzwerkprobleme zu erkennen.
-   Präziser ausgedrückt, schickt der Master ein "NO-OP"-Kommando an den Slave und misst die Zeit,
-   die vergeht, bis das Ergebnis des NO-OP-Kommandos wieder eintrifft.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help_zh_TW.html b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help_zh_TW.html
deleted file mode 100644
index c6c473d441..0000000000
--- a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/help_zh_TW.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-    監控 Master 到 Slave 的網路往返的回應時間，監控結果持續低於臨界值的 Slave 會被標為離線。
-
-    <p>
-    可以用來偵測沒有回應的 Slave，或是其他造成網路擁塞的問題。
-    具體來說，Master 會送出 no-op 指令給 Slave，並檢查拿到結果的時間。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/help.html b/core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/help.html
deleted file mode 100644
index abb86420d2..0000000000
--- a/core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/help.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div>
-    This monitors the available virtual memory space of the computer (commonly known as "swap space"),
-    and if it goes below a threshold, the slave is marked offline.
-
-    <p>
-    The exact definition of the swap space is platform dependent.
-
-    <ul>
-    <li>
-    On Windows, this value is
-    <a href="http://msdn.microsoft.com/en-us/library/aa366589(VS.85).aspx">the available space in the page file</a>,
-    but because Windows is capable of expanding the page file size automatically, the value doesn't really mean much.
-
-    <li>
-    On Linux, this value is obtained from <tt>/proc/meminfo</tt>.
-
-    <li>
-    On other Unix systems, this value is obtained by executing the <tt>top</tt> command.
-    </ul>
-
-    <p>
-    If you have an operating system where this value is not reported, please let us know so that we can improve this.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/help_de.html b/core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/help_de.html
deleted file mode 100644
index 4094d6cb63..0000000000
--- a/core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/help_de.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div>
-    Dieser Monitor überwacht den freien virtuellen Speicher auf den Slaves (auch als "Swap Space"
-    bekannt). Unterschreitet dieser eine bestimmte Schwelle, wird ein Slave offline genommen.
-
-    <p>
-    Die exakte Definition des Swap Spaces ist betriebssystemabhängig:
-
-    <ul>
-    <li>
-    Unter Windows ist dieser Wert
-    <a href="http://msdn.microsoft.com/en-us/library/aa366589(VS.85).aspx">der freie Platz in der Page-Datei</a>,
-    da aber Windows die Page-Datei automatisch vergrößern kann, ist der Wert nur bedingt von Bedeutung.
-
-    <li>
-    Unter Linux, wird dieser Wert aus <tt>/proc/meminfo</tt> ermittelt.
-
-    <li>
-    Unter anderen Unix-Betriebssystemen wird der Wert durch Ausführung des  <tt>top</tt>-Kommandos ermittelt.
-    </ul>
-
-    <p>
-    Wenn Sie ein Betriebssystem einsetzen, bei dem dieser Wert nicht angezeigt wird,
-    geben Sie uns Bescheid, damit wir diese Funktion weiter verbessern können.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/help_zh_TW.html b/core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/help_zh_TW.html
deleted file mode 100644
index 0c55c93eda..0000000000
--- a/core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/help_zh_TW.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div>
-    監控電腦可用的虛擬記憶體空間 (也叫做「Swap 空間」)，並將低於臨界值的 Slave 標為離線。
-
-    <p>
-    Swap 空間的確切定義會隨平台而有所不同。
-
-    <ul>
-    <li>
-    在 Windows 下，該值代表
-    <a href="http://msdn.microsoft.com/en-us/library/aa366589(VS.85).aspx">分頁檔的可用空間</a>。
-    不過 Windows 可以自動加大分頁檔，所以數據的意義不大。
-
-    <li>
-    在 Linux 環境下，該值將由 <tt>/proc/meminfo</tt> 取得。
-
-    <li>
-    在其他的 Unix 系統裡，我們會執行 <tt>top</tt> 指令取得數據。
-    </ul>
-
-    <p>
-    如果您用到了無法正確取得數據的作業系統，請不吝指教，方便我們著手改善。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help.html b/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help.html
index 31d6a0becb..d285370f91 100644
--- a/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help.html
+++ b/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help.html
@@ -9,5 +9,5 @@
     <p>
     More specifically, it checks the available disk space of a partition
     that includes directory designated by the <tt>java.io.tmpdir</tt> system property.
-    To check where this directory is on a given slave, go to <tt>${rootURL}/computer/SLAVENAME/systemInfo</tt>.
+    To check where this directory is on a given agent, go to <tt>${rootURL}/computer/SLAVENAME/systemInfo</tt>.
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help_de.html b/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help_de.html
deleted file mode 100644
index 5af367f282..0000000000
--- a/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help_de.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-    Überwacht den freien Festplattenplatz im Temporärverzeichnis. Unterschreitet der freie Platz eine
-    gewisse Schwelle, so wird der Slave offline genommen.
-    <p>
-    Java-Werkzeuge und Tests/Builds arbeiten häufig mit Dateien im Temporärverzeichnis und können
-    daher unerwartete Ergebnisse liefern, wenn der Platz in diesem Verzeichnis erschöpft ist.
-
-    <p>
-    Präziser ausgedrückt, wird der freie Festplattenplatz auf der Partition ermittelt, die das
-    Verzeichnis enthält, auf welches die Systemeigenschaft <tt>java.io.tmpdir</tt> verweist.
-    Um herauszufinden, wo dieses Verzeichnis auf einem bestimmten Slave liegt, rufen Sie 
-    <tt>${rootURL}/computer/SLAVENAME/systemInfo</tt> auf.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help_zh_TW.html b/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help_zh_TW.html
deleted file mode 100644
index 8f955aa373..0000000000
--- a/core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/help_zh_TW.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-    監控暫存目錄的可用磁碟空間，低於指定臨界值的節點會被設為離線。
-
-    <p>
-    Java 工具以及測試、建置過程很常會在暫存目錄裡建立檔案，空間不夠的話可能會無法正常運作。
-
-    <p>
-    更精確一點，監控程式會由 <tt>java.io.tmpdir</tt> 系統屬性找到暫存目錄，檢查其所在分割區的可用空間。
-    想要知道 Slave 使用的目錄是什麼，可以連到 <tt>${rootURL}/computer/SLAVENAME/systemInfo</tt>。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/config.jelly b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/config.jelly
new file mode 100644
index 0000000000..0e627effbc
--- /dev/null
+++ b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/config.jelly
@@ -0,0 +1,7 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson"
+  xmlns:f="/lib/form">
+  <f:entry field="allowAnonymousRead">
+    <f:checkbox default="true" title="${%Allow anonymous read access}"/>
+  </f:entry>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help-allowAnonymousRead.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help-allowAnonymousRead.html
new file mode 100644
index 0000000000..0f357d28e1
--- /dev/null
+++ b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help-allowAnonymousRead.html
@@ -0,0 +1,3 @@
+<div>
+  If checked, this will allow users who are not authenticated to access Jenkins in a read-only mode.
+</div>
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort.html b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort.html
index 37d845e2c7..69a4760025 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort.html
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort.html
@@ -1,7 +1,7 @@
 <div>
-  Jenkins uses a TCP port to communicate with slave agents launched via JNLP.
+  Jenkins uses a TCP port to communicate with agent agents launched via JNLP.
   Normally this port is chosen randomly to avoid collisions, but this would
-  make securing the system difficult. If you are not using JNLP slaves,
+  make securing the system difficult. If you are not using JNLP agents,
   it's recommend to disable this TCP port. Alternatively, you can specify
   the fixed port number so that you can configure your firewall accordingly.
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_de.html b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_de.html
deleted file mode 100644
index bad870a778..0000000000
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_de.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div>
-  Jenkins verwendet einen TCP-Port, um mit Slave-Knoten zu kommunizieren, die
-  über JNLP gestartet wurden. Normalerweise wird dieser Port zufällig
-  gewählt, um Kollisionen zu vermeiden - dies erschwert jedoch die Absicherung
-  des Systems. Wenn Sie keine JNLP-Slave-Knoten einsetzen, wird empfohlen,
-  diesen TCP-Port zu deaktivieren. Alternativ können Sie auch einen statischen Port
-  festlegen, um Ihre Firewall entsprechend leichter konfigurieren zu können.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_pt_BR.html b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_pt_BR.html
deleted file mode 100644
index 9e11fe0054..0000000000
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_pt_BR.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  O Jenkins usa uma porta TCP para se comunicar com os agentes slave lan&#231;ados via JNLP.
-  Normalmente esta porta &#233; escolhida aleat&#243;riamente para evitar colis&#245;es, mas isto
-  tornaria dif&#237;cil fazer a seguran&#231;a do sistema. Se voc&#234; n&#227;o estiver usado slaves JNLP,
-  &#233; recomendado desabilitar esta porta TCP. Alternativamente, voc&#234; pode especificar
-  um n&#250;mero de porta espec&#237;fico tal que voc&#234; possa configurar seu firewall corretamente.
-</div>
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_tr.html b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_tr.html
deleted file mode 100644
index d3de5461df..0000000000
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_tr.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-  Jenkins, JNLP arac&#305;l&#305;&#287;&#305; ile ba&#351;lat&#305;lan slave'ler ile ileti&#351;iminde TCP portunu
-  kullan&#305;r. Her ne kadar bu port numaras&#305;, herhangi bir &#231;ak&#305;&#351;may&#305; &#246;nlemek ad&#305;na
-  rastgele verilse de, sistem g&#252;venli&#287;inin y&#246;netiminde zorluk &#231;&#305;karacakt&#305;r. E&#287;er
-  JNLP slave'i kullanm&#305;yorsan&#305;z, bu TCP port numaras&#305;n&#305; devre d&#305;&#351;&#305; b&#305;rak&#305;n&#305;z.
-  Buna alternatif olarak, bu port numaras&#305;n&#305; sabit bir numara olarak belirlerseniz,
-  firewall kurallar&#305;n&#305; buna g&#246;re daha rahat ayarlayabilirsiniz (Port numaras&#305; sabit oldu&#287;undan,
-  firewall kurallar&#305;n&#305; bir defa tan&#305;mlaman&#305;z yeterli olabilecektir).
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_zh_TW.html b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_zh_TW.html
deleted file mode 100644
index 6f7678ed46..0000000000
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-slaveAgentPort_zh_TW.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Jenkins 使用 TCP 連接埠與透過 JNLP 啟動的 Slave 代理程式溝通。
-  為了避免衝突，連接埠一般是隨機挑選的，但可能造成系統資安的困擾。
-  如果您沒有任何 JNLP Slave，建議關閉這個 TCP 連接埠。
-  或是，您可以指定固定的連接埠數值，方便您調整防火牆設定。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
index 249d4cfbe8..ca23cf73a2 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
@@ -25,7 +25,7 @@ l.layout(norefresh:true, permission:app.ADMINISTER, title:my.displayName) {
             set("descriptor", my.descriptor);
 
             f.optionalBlock( field:"useSecurity", title:_("Enable security"), checked:app.useSecurity) {
-                f.entry (title:_("TCP port for JNLP slave agents"), field:"slaveAgentPort") {
+                f.entry (title:_("TCP port for JNLP agents"), field:"slaveAgentPort") {
                     f.serverTcpPort()
                 }
 
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_da.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_da.properties
index 0e53ad060c..02bb056995 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_da.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_da.properties
@@ -22,7 +22,6 @@
 
 LOADING=INDL\u00C6SER
 Enable\ security=Sl\u00E5 sikkerhed til
-TCP\ port\ for\ JNLP\ slave\ agents=TCP port til JNLP slaveagenter
 Markup\ Formatter=
 Access\ Control=Adgangskontrol
 Security\ Realm=Sikkerheds Realm
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties
index ed694c8119..a9010fb712 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties
@@ -22,7 +22,6 @@
 
 LOADING=LADE DATEN
 Enable\ security=Jenkins absichern
-TCP\ port\ for\ JNLP\ slave\ agents=TCP-Port f\u00fcr JNLP-Slave
 Disable\ remember\ me=Deaktiviere "Anmeldedaten speichern"
 Markup\ Formatter=Markup-Formatierer
 Access\ Control=Zugriffskontrolle
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_es.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_es.properties
index 60f4150e2e..5a6e60cccb 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_es.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_es.properties
@@ -22,7 +22,7 @@
 
 LOADING=CARGANDO
 Enable\ security=Activar seguridad
-TCP\ port\ for\ JNLP\ slave\ agents=Puerto TCP de JNLP para los agentes en los nodos secundarios
+TCP\ port\ for\ JNLP\ agents=Puerto TCP de JNLP para los agentes en los nodos secundarios
 Markup\ Formatter=
 Access\ Control=Control de acceso
 Security\ Realm=Seguuridad
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_fi.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_fi.properties
index f0de13e17d..5757a35336 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_fi.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_fi.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Enable\ security=Aktivoi kirjautuminen
-TCP\ port\ for\ JNLP\ slave\ agents=
 Markup\ Formatter=
 Access\ Control=P\u00E4\u00E4synhallinta
 Security\ Realm=
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_fr.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_fr.properties
index 3a8cc73e95..d70ab48cd3 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_fr.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_fr.properties
@@ -22,7 +22,6 @@
 
 LOADING=CHARGEMENT
 Enable\ security=Activer la s\u00E9curit\u00E9
-TCP\ port\ for\ JNLP\ slave\ agents=Port TCP pour les agents esclaves JNLP
 Markup\ Formatter=
 Access\ Control=Contr\u00F4le de l''acc\u00E8s
 Security\ Realm=Royaume pour la s\u00E9curit\u00E9 (Realm)
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_hu.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_hu.properties
index 4f86f54d34..2e3b82f054 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_hu.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_hu.properties
@@ -22,7 +22,6 @@
 
 LOADING=BET\u00D6LT\u00C9S
 Enable\ security=
-TCP\ port\ for\ JNLP\ slave\ agents=
 Markup\ Formatter=
 Access\ Control=
 Security\ Realm=
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_ja.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_ja.properties
index 6eeaeab039..73d37c2c96 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_ja.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_ja.properties
@@ -22,7 +22,6 @@
 
 LOADING=\u30ed\u30fc\u30c9\u4e2d...
 Enable\ security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u3092\u6709\u52b9\u5316
-TCP\ port\ for\ JNLP\ slave\ agents=JNLP\u30b9\u30ec\u30fc\u30d6\u7528TCP\u30dd\u30fc\u30c8\u756a\u53f7
 Markup\ Formatter=\u30de\u30fc\u30af\u30a2\u30c3\u30d7\u8a18\u6cd5
 Access\ Control=\u30a2\u30af\u30bb\u30b9\u5236\u5fa1
 Security\ Realm=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_nl.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_nl.properties
index 0f6020cc66..38a67ec667 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_nl.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_nl.properties
@@ -22,7 +22,6 @@
 
 LOADING=OPHALEN
 Enable\ security=Activeer beveiliging
-TCP\ port\ for\ JNLP\ slave\ agents=TCP-poort voor JNLP-slaafnodes
 Markup\ Formatter=
 Access\ Control=Toegangscontrole
 Security\ Realm=Beveiligingszone
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_pt_BR.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_pt_BR.properties
index 2a28726538..b920631d0b 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_pt_BR.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_pt_BR.properties
@@ -22,7 +22,6 @@
 
 LOADING=Carregando
 Enable\ security=Habilitar seguran�a
-TCP\ port\ for\ JNLP\ slave\ agents=Porta TCP para agentes slave JNLP
 Markup\ Formatter=Formatador de markup
 Access\ Control=Controle de acesso
 Security\ Realm=Dom\u00ednio (realm) de seguran\u00e7a
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_ru.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_ru.properties
index 49891a4e30..156daf036b 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_ru.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_ru.properties
@@ -22,7 +22,6 @@
 
 LOADING=\u0417\u0410\u0413\u0420\u0423\u0417\u041A\u0410
 Enable\ security=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u0430\u0449\u0438\u0442\u0443 
-TCP\ port\ for\ JNLP\ slave\ agents=TCP \u043f\u043e\u0440\u0442 \u0434\u043b\u044f JNLP \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0445 \u0430\u0433\u0435\u043d\u0442\u043e\u0432
 Markup\ Formatter=
 Access\ Control=\u041a\u043e\u043d\u0442\u0440\u043e\u043b\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0430
 Security\ Realm=\u041e\u0431\u043b\u0430\u0441\u0442\u044c \u0437\u0430\u0449\u0438\u0442\u044b (realm)
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_tr.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_tr.properties
index 383c978db6..1ef7e7eb53 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_tr.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_tr.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Enable\ security=G\u00fcvenli\u011fi devreye al
-TCP\ port\ for\ JNLP\ slave\ agents=JNLP Slave ajanlar\u0131 i\u00e7in TCP portu
 Markup\ Formatter=
 Access\ Control=Eri\u015fim Kontrol\u00fc
 Security\ Realm=G\u00fcvenlik Alan\u0131
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_CN.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_CN.properties
index dda1fcfe45..a4a5ce68dd 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_CN.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_CN.properties
@@ -22,7 +22,6 @@
 
 LOADING=\u52A0\u8F7D\u4E2D
 Enable\ security=\u542f\u7528\u5b89\u5168
-TCP\ port\ for\ JNLP\ slave\ agents=JNLP\u8282\u70b9\u4ee3\u7406\u7684TCP\u7aef\u53e3
 Markup\ Formatter=
 Access\ Control=\u8bbf\u95ee\u63a7\u5236
 Security\ Realm=\u5b89\u5168\u57df
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_TW.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_TW.properties
index 7966bc9a90..103ce2ab03 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_TW.properties
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_TW.properties
@@ -23,7 +23,6 @@
 
 LOADING=\u8f09\u5165\u4e2d
 Enable\ security=\u555f\u7528\u5b89\u5168\u6027
-TCP\ port\ for\ JNLP\ slave\ agents=JNLP Slave \u4ee3\u7406\u7a0b\u5f0f TCP \u57e0
 Markup\ Formatter=\u6a19\u8a18\u683c\u5f0f\u5668
 Access\ Control=\u5b58\u53d6\u63a7\u5236
 Security\ Realm=\u5b89\u5168\u6027\u9818\u57df
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
index bb12a30aa9..a4e2f822f2 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
@@ -22,67 +22,48 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<!-- tag file sed by both signup.jelly and addUser.jelly -->
+<!-- tag file used by both signup.jelly and addUser.jelly -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <l:layout norefresh="true" title="${%Sign up}">
-    <l:header>
-      <style>
-        <!-- match width with captcha image -->
-        INPUT {
-          width:200px;
-        }
-      </style>
-    </l:header>
-    <l:hasPermission permission="${app.READ}" it="${host}">
-      <st:include page="sidepanel.jelly" it="${host}" />
-    </l:hasPermission>
-    <l:main-panel>
-      <h1>${title}</h1>
-      <div style="margin: 2em;">
-        <j:if test="${data.errorMessage!=null}">
-          <div class="error" style="margin-bottom:1em">
-            ${data.errorMessage}
-          </div>
-        </j:if>
-        <form action="${rootURL}/securityRealm/${action}" method="post" style="text-size:smaller">
-          <table>
-            <tr>
-              <td>${%Username}:</td>
-              <td><input type="text" name="username" id="username" value="${data.username}" /></td>
-            </tr>
-            <tr>
-              <td>${%Password}:</td>
-              <td><input type="password" name="password1" value="${data.password1}" /></td>
-            </tr>
-            <tr>
-              <td>${%Confirm password}:</td>
-              <td><input type="password" name="password2" value="${data.password2}" /></td>
-            </tr>
-            <tr>
-              <td>${%Full name}:</td>
-              <td><input type="text" name="fullname" value="${data.fullname}" /></td>
-            </tr>
-            <tr>
-              <td>${%E-mail address}:</td>
-              <td><input type="text" name="email" value="${data.email}" /></td>
-            </tr>
-            <j:if test="${captcha}">
-              <tr>
-                <td>${%Enter text as shown}:</td>
-                <td>
-                  <input type="text" name="captcha" autocomplete="off" /><br />
-                  <img src="${rootURL}/securityRealm/captcha" alt="[captcha]"/>
-                </td>
-              </tr>
-            </j:if>
-          </table>
-          <f:submit value="${title}" />
-          <script>
-            $('username').focus();
-          </script>
-        </form>
+  <h1>${title}</h1>
+  <div style="margin: 2em;">
+    <j:if test="${data.errorMessage!=null}">
+      <div class="error" style="margin-bottom:1em">
+        ${data.errorMessage}
       </div>
-    </l:main-panel>
-  </l:layout>
+    </j:if>
+      <table>
+        <tr>
+          <td>${%Username}:</td>
+          <td><input type="text" name="username" id="username" value="${data.username}" /></td>
+        </tr>
+        <tr>
+          <td>${%Password}:</td>
+          <td><input type="password" name="password1" value="${data.password1}" /></td>
+        </tr>
+        <tr>
+          <td>${%Confirm password}:</td>
+          <td><input type="password" name="password2" value="${data.password2}" /></td>
+        </tr>
+        <tr>
+          <td>${%Full name}:</td>
+          <td><input type="text" name="fullname" value="${data.fullname}" /></td>
+        </tr>
+        <j:if test="${it.mailerPluginPresent}">
+        <tr>
+          <td>${%E-mail address}:</td>
+          <td><input type="text" name="email" value="${data.email}" /></td>
+        </tr>
+        </j:if>
+        <j:if test="${captcha}">
+          <tr>
+            <td>${%Enter text as shown}:</td>
+            <td>
+              <input type="text" name="captcha" autocomplete="off" /><br />
+              <img src="${rootURL}/securityRealm/captcha" alt="[captcha]"/>
+            </td>
+          </tr>
+        </j:if>
+      </table>
+  </div>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly
new file mode 100644
index 0000000000..8009ad6518
--- /dev/null
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly
@@ -0,0 +1,50 @@
+<!--
+The MIT License
+
+Copyright (c) 2004-2016, Sun Microsystems, Inc., CloudBees, Inc., Kohsuke Kawaguchi, Seiji Sogabe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!-- tag file used by both signup.jelly and addUser.jelly -->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <l:layout norefresh="true" title="${title}">
+    <l:header>
+      <style>
+        <!-- match width with captcha image -->
+        INPUT {
+          width:200px;
+        }
+      </style>
+    </l:header>
+    <l:hasPermission permission="${app.READ}" it="${host}">
+      <st:include page="sidepanel.jelly" it="${host}" />
+    </l:hasPermission>
+    <l:main-panel>
+      <form action="${rootURL}/securityRealm/${action}" method="post" style="text-size:smaller">
+        <local:_entryForm title="${title}" action="${action}" captcha="${captcha}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
+        <f:submit value="${title}" />
+        <script>
+          $('username').focus();
+        </script>
+      </form>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly
index aed3d5c5c8..daacc17bfc 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly
@@ -27,5 +27,5 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <local:_entryForm host="${it}" title="${%Create User}" action="createAccountByAdmin" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
+  <local:_entryFormPage host="${it}" title="${%Create User}" action="createAccountByAdmin" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly
index bc44b42acc..6ebd369ae0 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly
@@ -27,5 +27,5 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <local:_entryForm host="${it}" title="${%Create First Admin User}" action="createFirstAccount" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
+  <local:_entryFormPage host="${it}" title="${%Create First Admin User}" action="createFirstAccount" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
index d39afff6f9..9b7fe9d0fa 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
@@ -43,7 +43,7 @@ THE SOFTWARE.
             <td><a href="${user.url}/">${user.id}</a></td>
             <td><a href="${user.url}/">${user}</a></td>
             <td>
-              <a href="${user.url}/configure"><l:icon class="icon-setting icon-lg"/></a>
+              <a href="${user.url}/configure"><l:icon class="icon-gear2 icon-lg"/></a>
               <j:if test="${user.canDelete()}">
                 <a href="${user.url}/delete"><l:icon class="icon-edit-delete icon-md"/></a>
               </j:if>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly
index 49ef418e78..8d864d01e9 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <l:side-panel>
     <l:tasks>
       <l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
-      <l:task href="${rootURL}/manage" icon="icon-setting icon-md" permission="${app.ADMINISTER}" title="${%Manage Jenkins}"/>
+      <l:task href="${rootURL}/manage" icon="icon-gear2 icon-md" permission="${app.ADMINISTER}" title="${%Manage Jenkins}"/>
       <l:task href="addUser" icon="icon-new-user icon-md" permission="${app.ADMINISTER}" title="${%Create User}"/>
     </l:tasks>
   </l:side-panel>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
index 656e96c3c9..f2477da1df 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
@@ -27,5 +27,5 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <local:_entryForm host="${app}" title="${%Sign up}" action="createAccount" captcha="${it.isEnableCaptcha()}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
+  <local:_entryFormPage host="${app}" title="${%Sign up}" action="createAccount" captcha="${it.isEnableCaptcha()}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
 </j:jelly>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly
index 01c0197a62..8daec8d381 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly
@@ -27,5 +27,5 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <local:_entryForm host="${app}" title="${%Sign up}" action="createAccountWithFederatedIdentity" captcha="${true}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
+  <local:_entryFormPage host="${app}" title="${%Sign up}" action="createAccountWithFederatedIdentity" captcha="${true}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/AbstractCloudImpl/help-instanceCapStr.html b/core/src/main/resources/hudson/slaves/AbstractCloudImpl/help-instanceCapStr.html
index 08a970a6bf..75a258c36e 100644
--- a/core/src/main/resources/hudson/slaves/AbstractCloudImpl/help-instanceCapStr.html
+++ b/core/src/main/resources/hudson/slaves/AbstractCloudImpl/help-instanceCapStr.html
@@ -1,5 +1,5 @@
 <div>
-    You can place the upward limit to the number of slaves that Jenkins may launch from this cloud.
+    You can place the upward limit to the number of agents that Jenkins may launch from this cloud.
     This is useful for avoiding surprises in the billing statement.
 
     <P>
diff --git a/core/src/main/resources/hudson/slaves/AbstractCloudImpl/help-instanceCapStr_zh_TW.html b/core/src/main/resources/hudson/slaves/AbstractCloudImpl/help-instanceCapStr_zh_TW.html
deleted file mode 100644
index a8a73747df..0000000000
--- a/core/src/main/resources/hudson/slaves/AbstractCloudImpl/help-instanceCapStr_zh_TW.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div>
-    您可以設定 Jenkins 在這片雲中可以啟動的 Slave 上限數目。
-    可以避免收到帳單時受到太大的震憾。
-
-    <P>
-    以輸入 3 為例，Jenkins 在雲端執行個體數沒達上限前才能再啟動一個新的。
-    在這個方式下，最糟就算 Jenkins 起了執行個體後就置之不理，您還是有能同時執行的個體數上限。
-
-    <p>
-    不填的話代表不設上限。
-</div>
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command.html b/core/src/main/resources/hudson/slaves/CommandLauncher/help-command.html
index 7177d11330..ad61686f9f 100644
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command.html
+++ b/core/src/main/resources/hudson/slaves/CommandLauncher/help-command.html
@@ -1,8 +1,8 @@
 <div>
-  Command to be used to launch a slave agent program, which controls the slave
+  Command to be used to launch an agent program, which controls the agent
   computer and communicates with the master. Jenkins assumes that
   the executed program launches the <tt>slave.jar</tt> program on the correct
-  slave machine.
+  machine.
 
   <p>
   A copy of <tt>slave.jar</tt> can be downloaded from <a href="${rootURL}/jnlpJars/slave.jar"><tt>here</tt></a>.
@@ -11,9 +11,9 @@
   In a simple case, this could be
   something like "ssh <i>hostname</i> java -jar ~/bin/slave.jar".
 
-  However, it is often a good idea to write a small shell script, like the following, on a slave
+  However, it is often a good idea to write a small shell script, like the following, on an agent
   so that you can control the location of Java and/or slave.jar, as well as set up any
-  environment variables specific to this slave node, such as PATH.
+  environment variables specific to this node, such as PATH.
 
 <pre>
 #!/bin/sh
@@ -21,7 +21,7 @@ exec java -jar ~/bin/slave.jar
 </pre>
 
   <p>
-  You can use any command to run a process on the slave machine, such as RSH,
+  You can use any command to run a process on the agent machine, such as RSH,
   as long as stdin/stdout of this process will be connected to
   "java -jar ~/bin/slave.jar" eventually.
 
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_de.html b/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_de.html
deleted file mode 100644
index 699a727208..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_de.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div>
-  Befehl, um einen Slave-Agenten zu starten, der den Slave-Knoten kontrolliert
-  und mit dem Master-Knoten kommuniziert.
-
-  <p>
-  Wenn in diesem Feld ein Befehl angegeben ist, so wird dieser auf dem Master-Knoten
-  ausgeführt. Jenkins nimmt in diesem Fall an, daß der ausgeführte Befehl
-  das Programm <tt>slave.jar</tt> auf dem jeweiligen Slave-Knoten startet.
-
-  <p>
-  <tt>slave.jar</tt> befindet sich als <a href="${rootURL}/jnlpJars/slave.jar"><tt>WEB-INF/slave.jar</tt></a>.
-
-  <p>
-  Ein einfachen Fällen, könnte der Befehl zum Beispiel so aussehen:
-  "ssh <i>hostname</i> java -jar ~/bin/slave.jar".
-
-  Trotzdem ist es meistens eine gute Idee, ein kleines Shell-Skript wie das 
-  folgende auf dem Slave-Knoten einzusetzen. Dies ermöglicht zum einen, den Pfad der
-  verwendeten Java-Installation und/oder des Archives <tt>slave.jar</tt>
-  zu kontrollieren, als auch Umgebungsvariablen zu setzen, die spezifisch für
-  den jeweiligen Slave-Knoten sind (etwa PATH).
-
-<pre>
-#!/bin/sh
-exec java -jar ~/bin/slave.jar
-</pre>
-
-  <p>
-  Sie können jeden beliebigen Befehl verwenden, um einen Prozess auf dem
-  Slave-Knoten zu starten, z.B. rsh, solange die Standardein- und ausgabe
-  (STDIN, STDOUT) dieses Prozesses mit "java -jar ~/bin/slave.jar" verbunden sind.
-  <p>
-  
-  In einer größeren Installation könnte man außerdem in Betracht ziehen,
-  <tt>slave.jar</tt> von einem gemeinsamen Netzlaufwerk zu laden, so daß die
-  komplette Installation einfacher aktualisiert werden kann.
-  
-  <p>
-  Tipp: Eine Einstellung von "ssh -v <i>hostname</i>" kann hilfreich bei der Analyse von
-  Verbindungsproblemen sein.
-
-</div>
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_pt_BR.html b/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_pt_BR.html
deleted file mode 100644
index 406267125f..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_pt_BR.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div>
-  Comando para ser usado para lan&#231;ar o program agente na m&#225;quina slave, o qual controla o
-  computador slave e se comunica com o master.
-
-  <h3>Agentes slave JNLP</h3>
-  <p>
-  Deixe este campo vazio se voc&#234; quiser lan&#231;ar os agentes slave via JNLP.
-  Com esta configura&#231;&#227;o, a p&#225;gina de informa&#231;&#245;es do slave (jenkins/computer/***/) 
-  ter&#225; um &#237;cone de lan&#231;amento JNLP, e voc&#234; poder&#225; clicar no link da m&#225;quina slave
-  correta para lan&#231;ar o agente slave via JNLP.
-  <p>
-  Este modo &#233; conveniente para slaves Windows que frequentemente n&#227;o tem um mecanismo
-  de execu&#231;&#227;o remota.
-
-  <h3>Agentes slave ssh/rsh</h3>
-  <p>
-  Quando um comando real &#233; especificado neste campo,
-  este comando &#233; executado na m&#225;quina
-  master, e o Jenkins assume que o programa executado lan&#231;a o programa <tt>slave.jar</tt>
-  na m&#225;quina slave correta.
-
-
-  <p>
-  Uma c&#243;pia de <tt>slave.jar</tt> pode ser encontrada em <a href="${rootURL}/jnlpJars/slave.jar"><tt>WEB-INF/slave.jar</tt></a> dentro de
-  <tt>jenkins.war</tt>.
-
-  <p>
-  Em um simples caso, isto poderia ser
-  algo como "ssh <i>hostname</i> java -jar ~/bin/slave.jar".
-
-  Entretanto, &#233; uma boa id&#233;ia escrever um pequeno shell script, como o seguinte, em um slave
-  tal que voc&#234; possa controlar a localiza&#231;&#227;o do Java e/ou slave.jar, bem como configurar
-  qualquer vari&#225;vel de ambiente espec&#237;fica para este n&#243; slave, tal como PATH.
-  
-<pre>
-#!/bin/sh
-exec java -jar ~/bin/slave.jar
-</pre>
-
-  <p>
-  Voc&#234; pode usar qualquer comando para executar um processo na m&#225;quina slave, tal como RSH,
-  desde que as entrada/sa&#237;da padr&#227;o (stdin/stdout) deste processo estejam eventualmente
-  conectadas a "java -jar ~/bin/slave.jar".
-
-  <p>
-  Em uma grande implanta&#231;&#227;o, tamb&#233;m &#233; valioso considerar carregar <tt>slave.jar</tt> de
-  uma localiza&#231;&#227;o comum montada via NFS, assim voc&#234; n&#227;o tem que atualizar este arquivo toda vez
-  que voc&#234; atualizar o Jenkins.
-
-  <p>
-  Definir isto como "ssh -v <i>hostname</i>" pode ser &#250;til para depurar quest&#245;es de
-  conectividade.
-</div>
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_tr.html b/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_tr.html
deleted file mode 100644
index 98943c4192..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_tr.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<div>
-  Slave ajan&#305;, slave bilgisayar&#305; kontrol eder ve master bilgisayar ile ileti&#351;iminden
-  sorumludur. Buraya yaz&#305;lacak komut, slave ajan&#305; &#231;al&#305;&#351;t&#305;racak komuttur.
-
-  <p>
-  Jenkins, burada belirtilen komutun, do&#287;ru slave &#252;zerinde slave.jar'&#305; do&#287;ru &#351;ekilde
-  &#231;al&#305;&#351;t&#305;raca&#287;&#305;n&#305; varsayar ve bu komutu master &#252;zerinde &#231;al&#305;&#351;t&#305;r&#305;r.
-
-
-  <p>
-  <a href="${rootURL}/jnlpJars/slave.jar"><tt>slave.jar</tt></a>'&#305;n bir kopyas&#305;, <tt>jenkins.war</tt>'&#305;n i&#231;erisinde <tt>WEB-INF</tt>
-  klas&#246;r&#252; alt&#305;nda bulunabilir.
-
-  <p>
-  En basit &#351;ekilde, yaz&#305;lacak komut "ssh <i>hostname</i> java -jar ~/bin/slave.jar"
-  &#351;eklinde olmal&#305;d&#305;r.
-
-  Yinede a&#351;a&#287;&#305;daki gibi bir shell script yazarsan&#305;z, Java'n&#305;n ve slave.jar'&#305;n yerlerini
-  ve bu slave'e &#246;zg&#252; olabilecek ortam de&#287;i&#351;kenlerini (mesela PATH), kolayl&#305;kla
-  y&#246;netebilirsiniz.
-
-<pre>
-#!/bin/sh
-exec java -jar ~/bin/slave.jar
-</pre>
-
-  <p>
-  ?al&#305;&#351;t&#305;r&#305;lacak komutun stdin/stdout metodlar&#305; "java -jar ~/bin/slave.jar" ile
-  ili&#351;kili oldu&#287;u s&#252;rece, slave makinede RSH gibi komutlar&#305; &#231;al&#305;&#351;t&#305;rabilirsiniz.
-
-  <p>
-  Daha geni&#351; bir sistemde, <tt>slave.jar</tt> dosyas&#305;n&#305; ortak bir dizinden (NFS-mounted)
-  okutursan&#305;z, Husdon'&#305; her g&#252;ncelledi&#287;inizde slave'leri ayr&#305; ayr&#305; g&#252;ncellemek zorunda kalmazs&#305;n&#305;z.
-
-  <p>
-  Bu k&#305;s&#305;mda "ssh -v <i>hostname</i>" &#351;eklinde bir kullan&#305;m, ba&#287;lant&#305;da olu&#351;abilecek sorunlar&#305;
-  &#231;&#246;zmede yard&#305;mc&#305; olacakt&#305;r.
-</div>
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_zh_TW.html b/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_zh_TW.html
deleted file mode 100644
index af1e220f35..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help-command_zh_TW.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div>
-  啟動 Slave 代理程式的指令，可以控制 Slave 電腦並與 Master 溝通。
-  Jenkins 假設執行的程式會在正式的 Slave 機器上啟動 <tt>slave.jar</tt>。
-
-  <p>
-  可以由<a href="${rootURL}/jnlpJars/slave.jar"><strong>這裡</strong></a>下載 <tt>slave.jar</tt>。
-
-  <p>
-  簡單一點就像 "ssh <i>主機名稱</i> java -jar ~/bin/slave.jar"。
-
-  但是，一般會建議您在 Slave 上面寫一個小 Shell Script，控制 Java 及 slave.jar 的位置，
-  也能設定 PATH 這類節點間不盡相同的環境變數。就像:
-
-<pre>
-#!/bin/sh
-exec java -jar ~/bin/slave.jar
-</pre>
-
-  <p>
-  您可以使用任何指令執行 Slave 機器上的程式，例如 RSH。
-  只要最後程式的 stdin 及 stdout 被連到 "java -jar ~/bin/slave.jar" 就好。
-
-  <p>
-  大型部署環境下，可以考慮從掛載 NFS 的共通位置中載入 <tt>slave.jar</tt>，
-  就不用每次升級 Jenkins 時還要同步更新每部機器上的這個檔案。
-
-  <p>
-  設定成 "ssh -v <i>主機名稱</i>" 可以幫助您處理連線問題。
-</div>
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help.properties b/core/src/main/resources/hudson/slaves/CommandLauncher/help.properties
index e4d34a73f1..ea17495f1d 100644
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help.properties
+++ b/core/src/main/resources/hudson/slaves/CommandLauncher/help.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=Starts a slave by having Jenkins execute a command from the master. \
-  Use this when the master is capable of remotely executing a process on a slave, such as through ssh/rsh.
+blurb=Starts an agent by having Jenkins execute a command from the master. \
+  Use this when the master is capable of remotely executing a process on another machine, e.g. via SSH or RSH.
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help_da.properties b/core/src/main/resources/hudson/slaves/CommandLauncher/help_da.properties
deleted file mode 100644
index 0c16c82c07..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help_da.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=Starter en ny slave ved at Jenkins k\u00f8rer en kommando p\u00e5 master''en. \
-Brug dette n\u00e5r master''en er i stand til at fjernafvikle en proces p\u00e5 slaven, for eksempel igennem ssh/rsh.
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help_de.properties b/core/src/main/resources/hudson/slaves/CommandLauncher/help_de.properties
deleted file mode 100644
index 68a036e252..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help_de.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=\
-  Startet einen Slave, indem Jenkins vom Master aus einen Befehl auf dem Slave ausf�hrt. \
-  Verwenden Sie diese Option, wenn Jenkins Befehle auf entfernten Slaves ausf�hren \
-  kann, z.B. �ber ssh/rsh.
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help_fr.properties b/core/src/main/resources/hudson/slaves/CommandLauncher/help_fr.properties
deleted file mode 100644
index 724e3797a6..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help_fr.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe, Eric Lefevre-Ardant
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=Lance un esclave en demandant � Jenkins d''ex�cuter une commande � partir de la machine ma�tre. \
-  Utilisez cela quand le ma�tre est capable d''ex�cuter � distance des processus sur la machine esclave, par exemple par ssh/rsh.
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help_ja.properties b/core/src/main/resources/hudson/slaves/CommandLauncher/help_ja.properties
deleted file mode 100644
index c1dd1e4e03..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help_ja.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=\u30DE\u30B9\u30BF\u304B\u3089\u30B3\u30DE\u30F3\u30C9\u3092\u5B9F\u884C\u3057\u3066\u30B9\u30EC\u30FC\u30D6\u3092\u8D77\u52D5\u3057\u307E\u3059\u3002\
-  ssh\u3084rsh\u7D4C\u7531\u7B49\u3067\u3001\u30DE\u30B9\u30BF\u304C\u30B9\u30EC\u30FC\u30D6\u306E\u30D7\u30ED\u30BB\u30B9\u3092\u30EA\u30E2\u30FC\u30C8\u304B\u3089\u5B9F\u884C\u3067\u304D\u308B\u5834\u5408\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties b/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties
deleted file mode 100644
index cccf5c035e..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Starts a slave by having Jenkins execute a command from the master. \
-# Use this when the master is capable of remotely executing a process on a slave, such as through ssh/rsh.
-blurb=Iniciar um slave executando por um comando executado no master \
-	Se n\u00e3o for poss\u00edvel, execute o comando via ssh/rsh
-
-
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help_zh_TW.properties b/core/src/main/resources/hudson/slaves/CommandLauncher/help_zh_TW.properties
deleted file mode 100644
index 7900696b3b..0000000000
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help_zh_TW.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=\u8b93 Jenkins \u5728 Master \u4e0a\u57f7\u884c\u6307\u4ee4\u555f\u52d5 Slave\u3002\
-  \u9069\u7528\u65bc\u53ef\u4ee5\u9060\u7aef\u57f7\u884c Slave \u7a0b\u5f0f\u7684 Master\uff0c\u4f8b\u5982\u900f\u904e ssh \u6216 rsh\u3002
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main.jelly b/core/src/main/resources/hudson/slaves/ComputerLauncher/main.jelly
index 698a2674ee..70b5aa9137 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main.jelly
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
         <l:hasPermission permission="${it.CONNECT}">
           <form method="post" action="launchSlaveAgent">
-            <f:submit value="${%Relaunch slave agent}" />
+            <f:submit value="${%Relaunch agent}" />
           </form>
         </l:hasPermission>
       </j:when>
@@ -42,7 +42,7 @@ THE SOFTWARE.
       <j:otherwise>
         <l:hasPermission permission="${it.CONNECT}">
           <form method="post" action="launchSlaveAgent">
-            <f:submit value="${%Launch slave agent}" />
+            <f:submit value="${%Launch agent}" />
           </form>
         </l:hasPermission>
       </j:otherwise>
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_bg.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_bg.properties
deleted file mode 100644
index 6f764d513e..0000000000
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_bg.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Launch\ slave\ agent=\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u0430\u0433\u0435\u043D\u0442\u0430 \u043D\u0430 \u043C\u0430\u0448\u0438\u043D\u0430\u0442\u0430
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_da.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_da.properties
index 16c2811216..51d84878fd 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_da.properties
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_da.properties
@@ -20,7 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Launch\ slave\ agent=Start slave agenter
 launchingDescription=Denne node er ved at starte op
 See\ log\ for\ more\ details=Se loggen for flere detaljer
-Relaunch\ slave\ agent=Genstart slave agent
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_de.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_de.properties
index 0646fb1fb3..d9bfb36500 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_de.properties
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_de.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 See\ log\ for\ more\ details=Mehr dazu im Systemprotokoll
-Launch\ slave\ agent=Slave-Agenten starten
-launchingDescription=Dieser Knoten ist offline, weil Jenkins den dortigen Slave-Agenten nicht starten konnte.
-Relaunch\ slave\ agent=Slave-Agenten neu starten
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_es.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_es.properties
index c999de630b..6d65f4a03f 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_es.properties
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_es.properties
@@ -22,5 +22,5 @@
 
 launchingDescription=Este nodo va a ser ejecutado.
 See\ log\ for\ more\ details=Echa un vistazo al log para ver mas detalles
-Launch\ slave\ agent=Lanzar agente esclavo
-Relaunch\ slave\ agent=Relanzar agente esclavo
+Launch\ agent=Lanzar agente
+Relaunch\ agent=Relanzar agente
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_fr.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_fr.properties
index 9607e04b05..5b28b80fdc 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_fr.properties
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_fr.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 See\ log\ for\ more\ details=Voir les logs pour plus de d�tails
-Launch\ slave\ agent=Lancer l''agent esclave
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_ja.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_ja.properties
index 7d1cb847a6..1b6052a5e5 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_ja.properties
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_ja.properties
@@ -21,6 +21,4 @@
 # THE SOFTWARE.
 
 See\ log\ for\ more\ details=\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167
-Launch\ slave\ agent=\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u8D77\u52D5
-Relaunch\ slave\ agent=\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u518D\u8D77\u52D5
 launchingDescription=\u3053\u306E\u30CE\u30FC\u30C9\u306F\u8D77\u52D5\u6E08\u307F\u3067\u3059\u3002
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties
index 58f89245df..4fc0b8c1b0 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Relaunch\ slave\ agent=Relan\u00e7ar o agente slave
 # This node is being launched.
 launchingDescription=Este n\u00f3 est\u00e1 sendo lan\u00e7ado
-Launch\ slave\ agent=Lan\u00e7ar agente slave
 See\ log\ for\ more\ details=Veja o log para mais detalhes
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_ru.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_ru.properties
deleted file mode 100644
index 90db7b8554..0000000000
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_ru.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Launch\ slave\ agent=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0443\u0437\u0435\u043B
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_sv_SE.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_sv_SE.properties
index 42f78c2c36..61a5469b23 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_sv_SE.properties
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_sv_SE.properties
@@ -20,6 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Launch\ slave\ agent=Starta agent
 See\ log\ for\ more\ details=Se loggen f\u00F6r mer information
 description=Denna nod \u00E4r fr\u00E5nkopplad eftersom Jenkins kunde inte starta agenten p\u00E5 noden.
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_zh_TW.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_zh_TW.properties
index 8505469b09..787a6ef670 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_zh_TW.properties
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_zh_TW.properties
@@ -22,5 +22,3 @@
 
 launchingDescription=\u672C\u7BC0\u9EDE\u6B63\u5728\u555F\u52D5\u4E2D\u3002
 See\ log\ for\ more\ details=\u67E5\u770B\u65E5\u8A8C\u53D6\u5F97\u8A73\u7D30\u8CC7\u6599
-Relaunch\ slave\ agent=\u91CD\u65B0\u555F\u52D5 Slave \u4EE3\u7406\u7A0B\u5F0F
-Launch\ slave\ agent=\u555F\u52D5 Slave \u4EE3\u7406\u7A0B\u5F0F
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_ru.properties b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_ru.properties
index 453808d5bc..5a6688a923 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_ru.properties
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_ru.properties
@@ -20,14 +20,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Master/Slave\ Support=\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u0433\u043b\u0430\u0432\u043d\u044b\u0439/\u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0439
 Master=\u0413\u043b\u0430\u0432\u043d\u044b\u0439
 Name=\u0418\u043c\u044f
 Description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
 This\ Jenkins\ server=\u0421\u0435\u0440\u0432\u0435\u0440 Jenkins
 \#\ of\ executors=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0432-\u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0435\u0439
 Local\ FS\ root=\u041a\u043e\u0440\u0435\u043d\u044c \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u043e\u0439 \u0424\u0421
-Slaves=\u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0435
 Name\ is\ mandatory=\u0418\u043c\u044f \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044f \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u043e
 Number\ of\ executors\ is\ mandatory.=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0435\u0439 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u043e
 Remote\ root\ directory=\u041a\u043e\u0440\u0435\u043d\u044c \u0443\u0434\u0430\u043b\u0435\u043d\u043d\u043e\u0439 \u0424\u0421
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail.properties
index 273ee6a2e6..70c380808f 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail.properties
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail.properties
@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 detail=\
-  Adds a plain, dumb slave to Jenkins. This is called "dumb" because Jenkins doesn\u2019t provide \
-  higher level of integration with these slaves, such as dynamic provisioning. \
-  Select this type if no other slave types apply &mdash; for example such as when you are adding \
+  Adds a plain, permanent agent to Jenkins. This is called "permanent" because Jenkins doesn\u2019t provide \
+  higher level of integration with these agents, such as dynamic provisioning. \
+  Select this type if no other agent types apply &mdash; for example such as when you are adding \
   a physical computer, virtual machines managed outside Jenkins, etc.
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_da.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_da.properties
deleted file mode 100644
index 71e4c731a4..0000000000
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_da.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-detail=Tilf\u00f8jer en almindelig dum slave til Jenkins. Disse slaver kaldes ''dumme'' da Jenkins ikke \
-tilbyder et h\u00f8jere niveau af kontrol over disse slaver, s\u00e5som dynamisk provisionering. \
-V\u00e6lg denne type hvis ingen anden slavetype passer &mdash; for eksempel hvis du \
-tilf\u00f8jer en fysisk computer/ virtuel maskine bestyret udenfor Jenkins, mv.
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_de.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_de.properties
deleted file mode 100644
index 0941e45018..0000000000
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_de.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-detail=F\u00FCgt einen einfachen, simplen Slave-Knoten hinzu. Der Knotentyp hei\u00DFt "dumb" (=einfach, simpel), da er \u00FCber keine enge Integration mit Jenkins verf\u00FCgt, wie etwa dynamische Aktualisierungen. Verwenden Sie diesen Knotentyp, wenn keine anderen Knotentypen passen &mdash; zum Beispiel wenn Sie einen real existierenden Rechner hinzuf\u00FCgen oder virtuelle Maschinen erg\u00E4nzen, die ausserhalb von Jenkins verwaltet werden, usw.
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_es.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_es.properties
index fee95acacc..97159a9512 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_es.properties
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_es.properties
@@ -21,8 +21,8 @@
 # THE SOFTWARE.
 
 detail=\
-  A�adir un esclavo pasivo a Jenkins. Es llamado ''pasivo'' porque Jenkins no provee ningun tipo de \
-  integraci�n de alto nivel con estos esclavos, como pueda ser aprovisionamiento din�mico. \
+  A�adir un agente permanente a Jenkins. Es llamado ''permanente'' porque Jenkins no provee ningun tipo de \
+  integraci�n de alto nivel con estos agentes, como pueda ser aprovisionamiento din�mico. \
   Selecciona este tipo si no hay ning�n otro tipo mas adecuado. Por ejemplo cuando se a�aden \
   maquinas f�sicas o virtuales gestionadas desde fuera de Jenkins, etc.
 
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_fr.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_fr.properties
deleted file mode 100644
index 6aabb89a4e..0000000000
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_fr.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-detail=\
-  Ajoute un esclave simple � Jenkins. Cet esclave est dit "passif" ("dumb") car Jenkins ne fournit pas \
-  d''int�gration d''un niveau plus �lev� pour ce type d''esclave, comme le provisioning dynamique. \
-  S�lectionnez ce type si aucun autre type d''esclave ne s''applique &mdash; par exemple quand vous \
-  ajoutez un ordinateur physique, une machine virtuelle g�r�e s�par�ment de Jenkins, etc.
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_ja.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_ja.properties
deleted file mode 100644
index 9e288307c5..0000000000
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_ja.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-detail=\
-  \u30B7\u30F3\u30D7\u30EB\u3067\u57FA\u672C\u7684\u306A\u6A5F\u80FD\u3060\u3051\u3092\u6301\u3064\u30B9\u30EC\u30FC\u30D6\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\u51E6\u7406\u91CF\u306B\u5FDC\u3058\u3066\u52D5\u7684\u306B\u30B9\u30EC\u30FC\u30D6\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306A\u3001\
-  \u9AD8\u30EC\u30D9\u30EB\u306E\u6A5F\u80FD\u3092\u63D0\u4F9B\u3057\u306A\u3044\u305F\u3081"\u30C0\u30E0(dumb)"\u3068\u547C\u3070\u308C\u307E\u3059\u3002\
-  \u30B3\u30F3\u30D4\u30E5\u30FC\u30BF\u30FC\u3082\u3057\u304F\u306F\u3001Jenkins\u304C\u7BA1\u7406\u3057\u306A\u3044\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306A\u3068\u304D\u306B\u3001\u4ED6\u306E\u30B9\u30EC\u30FC\u30D6\u3092\u5229\u7528\u3067\u304D\u306A\u3051\u308C\u3070\u3001\
-  \u3053\u306E\u30BF\u30A4\u30D7\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties
deleted file mode 100644
index 7a0e6597c5..0000000000
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# \
-# Adds a plain, dumb slave to Jenkins. This is called "dumb" because Jenkins doesn''t provide \
-# higher level of integration with these slaves, such as dynamic provisioning. \
-# Select this type if no other slave types apply &mdash; for example such as when you are adding \
-# a physical computer, virtual machines managed outside Jenkins, etc.
-detail=Adiciona um slave simples e burro ao Jenkins. \u00c9 chamado "burro" porque o Jenkins n\u00e3o prov\u00ea um maior n\u00edvel de integra\u00e7\u00e3o com estes slaves, como um provisionamento din\u00e2mico. Selecione este tipo se nenhum outro slave se aplica; por exemplo como quando voc\u00ea est\u00e1 adicionando um computador f\u00edsico, m\u00e1quinas virtuais gerenci\u00e1veis fora do Jenkins, etc.
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_sv_SE.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_sv_SE.properties
deleted file mode 100644
index 0887037441..0000000000
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_sv_SE.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-detail=L\u00E4gger till en normal dum slav till Jenkins. Denna kallas "dum" eftersom Jenkins inte tillhandah\u00E5ller en h\u00F6gniv\u00E5integrering med slavarna, s\u00E5som dynamisk provisionering. V\u00E4lj denna typ om inga andra slavtyper g\u00E5r att till\u00E4mpa &ndash; som t ex n\u00E4r du l\u00E4gger till en fysisk dator, virtuella maskiner som hanteras utanf\u00F6r Jenkins, osv.
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_zh_TW.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_zh_TW.properties
deleted file mode 100644
index ea5e453e15..0000000000
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_zh_TW.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-detail=\
-  \u65b0\u589e\u967d\u6625 Slave \u5230 Jenkins \u88e1\u3002\
-  \u4e4b\u6240\u4ee5\u53eb\u505a\u300c\u967d\u6625\u300d\uff0c\u662f\u56e0\u70ba Jenkins \u6c92\u6709\u63d0\u4f9b\u9019\u985e Slave \u4e00\u4e9b\u9032\u968e\u6574\u5408\u529f\u80fd\uff0c\u4f8b\u5982\u52d5\u614b\u4f48\u5efa\u3002\
-  \u6c92\u6709\u5176\u4ed6\u9069\u5408\u7684 Slave \u985e\u578b\u6642\u53ef\u4ee5\u4f7f\u7528\uff0c\u4f8b\u5982\u591a\u52a0\u4e86\u4e00\u90e8\u96fb\u8166\uff0c\u6216\u662f\u4e0d\u53d7 Jenkins \u7ba1\u7406\u7684\u865b\u64ec\u6a5f\u5668...\u3002
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly
index 9cd7fbc2e6..b2becef5dc 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly
@@ -24,13 +24,13 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:entry title="${%List of key-value pairs}" help="${descriptor.getHelpPage()}">
+  <f:entry title="${%List of variables}" help="${descriptor.getHelpPage()}">
     <f:repeatable var="env" items="${instance.envVars.entrySet()}">
       <table width="100%">
-        <f:entry title="${%name}">
+        <f:entry title="${%Name}">
           <f:textbox name="env.key" value="${env.key}" />
         </f:entry>
-        <f:entry title="${%value}">
+        <f:entry title="${%Value}">
           <f:textbox name="env.value" value="${env.value}" />
         </f:entry>
       	<f:entry title="">
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ca.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ca.properties
index 1c81470a77..312c2fd01a 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ca.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ca.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-name=nom
-value=valor
+Name=nom
+Value=valor
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_da.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_da.properties
index c433ae0a82..86e7383834 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_da.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_da.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-name=navn
-value=v\u00e6rdi
-List\ of\ key-value\ pairs=Liste af n\u00f8gle-v\u00e6rdi par
+Name=navn
+Value=v\u00e6rdi
+List\ of\ variables=Liste af n\u00f8gle-v\u00e6rdi par
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_de.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_de.properties
index b5a66fb491..ccbb48667e 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_de.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_de.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=Liste der Schl�ssel/Wert-Paare
-name=Name
-value=Wert
+List\ of\ variables=Liste der Variablen
+Name=Name
+Value=Wert
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_es.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_es.properties
index a490ffc34e..b0f51c8581 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_es.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_es.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=Lista de nombre-valores
-name=nombre
-value=valor
+List\ of\ variables=Lista de nombre-valores
+Name=nombre
+Value=valor
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_es_AR.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_es_AR.properties
index c0989a3782..7ff0c10db6 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_es_AR.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_es_AR.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-name=nombre
-value=valor
+Name=nombre
+Value=valor
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_fi.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_fi.properties
index 95f1c7a0dc..5ee81b48f5 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_fi.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_fi.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=Lista avain-arvo pareja
-name=nimi
-value=arvo
+List\ of\ variables=Lista avain-arvo pareja
+Name=nimi
+Value=arvo
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_fr.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_fr.properties
index 1512c60d9f..5c0bd6de93 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_fr.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_fr.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=Liste des paires cl�-valeur
-name=nom
-value=valeur
+List\ of\ variables=Liste des paires cl�-valeur
+Name=nom
+Value=valeur
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_he.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_he.properties
index d732df9452..fced55bf18 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_he.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_he.properties
@@ -1,5 +1,5 @@
 # This file is under the MIT License by authors
 
-List\ of\ key-value\ pairs=\u05E8\u05E9\u05D9\u05DE\u05D4 \u05E9\u05DC \u05E9\u05D3\u05D4-\u05E2\u05E8\u05DA
-name=\u05E9\u05DD
-value=\u05E2\u05E8\u05DA
+List\ of\ variables=\u05E8\u05E9\u05D9\u05DE\u05D4 \u05E9\u05DC \u05E9\u05D3\u05D4-\u05E2\u05E8\u05DA
+Name=\u05E9\u05DD
+Value=\u05E2\u05E8\u05DA
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_it.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_it.properties
index 155f8ee2f4..becdcdad03 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_it.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_it.properties
@@ -1,5 +1,5 @@
 # This file is under the MIT License by authors
 
-List\ of\ key-value\ pairs=Lista di coppie chiave-valore
-name=nome
-value=valore
+List\ of\ variables=Lista di coppie chiave-valore
+Name=nome
+Value=valore
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ja.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ja.properties
index c5a5bf79f8..d4ee4ce65b 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ja.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ja.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=\u30AD\u30FC\u3068\u5024\u306E\u30EA\u30B9\u30C8
-name=\u30AD\u30FC
-value=\u5024
+List\ of\ variables=\u30AD\u30FC\u3068\u5024\u306E\u30EA\u30B9\u30C8
+Name=\u30AD\u30FC
+Value=\u5024
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ko.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ko.properties
index 328e56c2d4..3118f5607d 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ko.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ko.properties
@@ -1,5 +1,5 @@
 # This file is under the MIT License by authors
 
-List\ of\ key-value\ pairs=\uD0A4-\uAC12 \uBAA9\uB85D
-name=\uC774\uB984
-value=\uAC12
+List\ of\ variables=\uD0A4-\uAC12 \uBAA9\uB85D
+Name=\uC774\uB984
+Value=\uAC12
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_lt.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_lt.properties
index 106fcf9802..9c2b27879a 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_lt.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_lt.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-name=pavadinimas
-value=reik\u0161m\u0117
+Name=pavadinimas
+Value=reik\u0161m\u0117
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_nb_NO.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_nb_NO.properties
index 934d2f3a66..63f92aa213 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_nb_NO.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_nb_NO.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=Liste over n\u00F8kkel-verdi par
-name=N\u00F8kkel
-value=Verdi
+List\ of\ variables=Liste over n\u00F8kkel-verdi par
+Name=N\u00F8kkel
+Value=Verdi
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_nl.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_nl.properties
index ccdff27ce1..47de859a2b 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_nl.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_nl.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=Lijst van sleutel-waarde-paren
-name=naam
-value=waarde
+List\ of\ variables=Lijst van sleutel-waarde-paren
+Name=naam
+Value=waarde
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pl.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pl.properties
index 6590886f6c..7774f0d27f 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pl.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pl.properties
@@ -1,5 +1,5 @@
 # This file is under the MIT License by authors
 
-List\ of\ key-value\ pairs=Lista par klucz-warto\u015B\u0107
-name=nazwa
-value=warto\u015B\u0107
+List\ of\ variables=Lista par klucz-warto\u015B\u0107
+Name=nazwa
+Value=warto\u015B\u0107
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_BR.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_BR.properties
index c1c03bf6e8..4d580ac490 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_BR.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_BR.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-value=valor
-name=nome
-List\ of\ key-value\ pairs=Lista de pares de chave-valor
+Value=valor
+Name=nome
+List\ of\ variables=Lista de pares de chave-valor
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_PT.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_PT.properties
index 7454a85ecc..a1bab80dd3 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_PT.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_PT.properties
@@ -1,5 +1,5 @@
 # This file is under the MIT License by authors
 
-List\ of\ key-value\ pairs=Lista de pares chave-valor
-name=nome
-value=valor
+List\ of\ variables=Lista de pares chave-valor
+Name=nome
+Value=valor
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ru.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ru.properties
index 369f0bf033..bdb277f7a1 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ru.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_ru.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=\u0421\u043F\u0438\u0441\u043E\u043A \u043F\u0430\u0440 "\u043A\u043B\u044E\u0447-\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435"
-name=\u0438\u043C\u044F
-value=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435
+List\ of\ variables=\u0421\u043F\u0438\u0441\u043E\u043A \u043F\u0430\u0440 "\u043A\u043B\u044E\u0447-\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435"
+Name=\u0438\u043C\u044F
+Value=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_sk.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_sk.properties
index 7cbfa3b055..5d8d7592e3 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_sk.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_sk.properties
@@ -1,5 +1,5 @@
 # This file is under the MIT License by authors
 
-List\ of\ key-value\ pairs=Zoznam p\u00E1rov k\u013E\u00FA\u010D - hodnota
-name=k\u013E\u00FA\u010D
-value=hodnota
+List\ of\ variables=Zoznam p\u00E1rov k\u013E\u00FA\u010D - hodnota
+Name=k\u013E\u00FA\u010D
+Value=hodnota
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_sv_SE.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_sv_SE.properties
index 89f32c98c5..2c29646a5c 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_sv_SE.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_sv_SE.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=Lista p\u00E5 nyckel-v\u00E4rde par
-name=namn
-value=v\u00E4rde
+List\ of\ variables=Lista p\u00E5 nyckel-v\u00E4rde par
+Name=namn
+Value=v\u00E4rde
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_zh_CN.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_zh_CN.properties
index 3d6d6b76d8..e70d102c3c 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_zh_CN.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_zh_CN.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=\u952E\u503C\u5BF9\u5217\u8868
-name=\u952E
-value=\u503c
+List\ of\ variables=\u952E\u503C\u5BF9\u5217\u8868
+Name=\u952E
+Value=\u503c
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_zh_TW.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_zh_TW.properties
index 7176ec4fa6..ad09037b0f 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_zh_TW.properties
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_zh_TW.properties
@@ -21,6 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-List\ of\ key-value\ pairs=Key-Value \u5c0d\u61c9\u6e05\u55ae
-name=\u540d\u7a31
-value=\u503c
+List\ of\ variables=Key-Value \u5c0d\u61c9\u6e05\u55ae
+Name=\u540d\u7a31
+Value=\u503c
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs.html b/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs.html
index a790e8cb3c..085afd9482 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs.html
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs.html
@@ -1,5 +1,5 @@
 <div>
-    If the slave JVM should be launched with additional VM arguments, such as "-Xmx256m",
+    If the agent JVM should be launched with additional VM arguments, such as "-Xmx256m",
     specify those here. List of all the options are available
     <a href="http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp" target="_new">here</a>.
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_de.html b/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_de.html
deleted file mode 100644
index cba877b87d..0000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_de.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-    Soll die Slave-JVM mit zusätzlichen VM-Argumenten gestartet werden, z.B. "-Xmx256m",
-    können Sie diese hier angeben. Eine Liste aller unterstützten Optionen finden Sie
-    <a href="http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp" target="_new">hier</a>.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_zh_TW.html b/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_zh_TW.html
deleted file mode 100644
index c60736e61b..0000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_zh_TW.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-    要是 Slave JVM 啟動時需要指定 "-Xmx256m" 這類額外的 VM 參數，可以在這裡設定。
-    在<a href="http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp" target="_new">這裡</a>可以看到所有選項。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties
index b0c7d4df39..6d4dfb1b47 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties
@@ -20,7 +20,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=Starts a slave by launching an agent program through <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a>. \
-  The launch in this case is initiated by the slave, \
-  thus slaves need not be IP reachable from the master (e.g. behind the firewall.) \
-  It is still possible to start a launch without GUI, for example as a Windows service.
\ No newline at end of file
+blurb=Allows an agent to be launched using <a href="https://en.wikipedia.org/wiki/Java_Web_Start" target="_blank">Java Web Start</a>.<br>\
+  In this case, a JNLP file must be opened on the agent machine, which will \
+  establish a TCP connection to the Jenkins master.<br>\
+  This means that the agent need not be reachable from the master; the agent \
+  just needs to be able to reach the master. If you have enabled security via \
+  the <i>Configure Global Security</i> page, you can customise the port on \
+  which the Jenkins master will listen for incoming JNLP agent connections.<br>\
+  By default, the JNLP agent will launch a GUI, but it's also possible to run \
+  a JNLP agent without a GUI, e.g. as a Window service.
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_da.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_da.properties
deleted file mode 100644
index 9a21976acd..0000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_da.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=Starter en slave via et agentprogram gennem <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a>. \
-Slave opstarten bliver i dette tilf\u00e6lde initieret af slaven, \
-s\u00e5ledes beh\u00f8ver slaven i dette tilf\u00e6lde ikke at v\u00e6re IP tilg\u00e6ngelig fra master''en (f.eks. bag en firewall.) \
-Det er ogs\u00e5 her muligt at starte slaven uden GUI, for eksempel som en Windows service.
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_de.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_de.properties
deleted file mode 100644
index 0481b8a47c..0000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_de.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=\
-  Schaltet einen Slave ein, indem ein Agent �ber \
-  <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a> gestartet wird. \
-  Da der Start in diesem Fall vom Slave aus initiiert wird, muss der Slave nicht \
-  per IP-Adresse von Master aus erreichbar sein (z.B. wenn der Slave hinter einer \
-  Firewall liegt). Es ist weiterhin m�glich, den Slave ohne Benutzeroberfl�che \
-  zu starten, z.B. als Windows Dienst.
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_es.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_es.properties
index 76bb39241a..26aee9fd3a 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_es.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_es.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=Arranca un esclavo ejecutando un programa agente usando <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a>.\
-  De modo que el esclavo inicia la ejecuci�n, por lo que los esclavos no necesitan una IP accesible desde el master. \
+blurb=Arranca un agente haciendo uso de <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a>.\
+  De modo que el agente inicia la ejecuci�n, por lo que los agentes no necesitan una IP accesible desde el master. \
   Incluso es posible arrancar una ejecuci�n sin GUI, como puede ser un servicio Windows.
 
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_fr.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_fr.properties
deleted file mode 100644
index 796bd6c006..0000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_fr.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe, Eric Lefevre-Ardant
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=Lance un esclave en d�marrant un agent par <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a>. \
-  Le lancement dans ce cas est initi� par l''esclave&nbsp;; \
-  ainsi, les esclaves n''ont pas besoin d''�tre accessibles par IP par la machine ma�tre (par exemple s''ils sont derri�re un firewall.) \
-  Il reste possible de lancer un d�marrage sans GUI, par exemple par un service Windows.
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_ja.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_ja.properties
deleted file mode 100644
index 6318fac04e..0000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_ja.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=<a href="http://ja.wikipedia.org/wiki/Java_Web_Start">JNLP</a>\u7D4C\u7531\u3067\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30D7\u30ED\u30B0\u30E9\u30E0\u3092\u5B9F\u884C\u3059\u308B\u3053\u3068\u3067\u30B9\u30EC\u30FC\u30D6\u3092\u8D77\u52D5\u3057\u307E\u3059\u3002\
-  \u3053\u306E\u5834\u5408\u8D77\u52D5\u306F\u30B9\u30EC\u30FC\u30D6\u304B\u3089\u958B\u59CB\u3059\u308B\u306E\u3067\u3001\u30B9\u30EC\u30FC\u30D6\u306F\u30DE\u30B9\u30BF\u304B\u3089IP\u30EA\u30FC\u30C1\u30E3\u30D6\u30EB\u3067\u3042\u308B\u5FC5\u8981\u306F\u3042\u308A\u307E\u305B\u3093(\u4F8B \u30D5\u30A1\u30A4\u30A2\u30FC\u30A6\u30A9\u30FC\u30EB\u306E\u4E2D\u306A\u3069)\u3002\
-  \u4F8B\u3048\u3070Windows\u30B5\u30FC\u30D3\u30B9\u306A\u3069\u3001GUI\u306A\u3057\u3067\u3082\u8D77\u52D5\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties
deleted file mode 100644
index 7aee9cf2b8..0000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Starts a slave by launching an agent program through <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a>. \
-# The launch in this case is initiated by the slave, \
-# thus slaves need not be IP reachable from the master (e.g. behind the firewall.) \
-# It is still possible to start a launch without GUI, for example as a Windows service.
-blurb=Iniciar um slave pelo programa agente <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a>. \
-  Nesse caso, o lan\u00e7amento \u00e9 iniciado pelo slave, \
-  porem o endere\u00e7o IP do Slave precisa ser alcan\u00e7avel pelo master (ex.: firewall ou proxy),
-  Tamb\u00e9m \u00e9 possivel lan\u00e7ar sem GUI, por exemplo como um servi\u00e7o do Windows.
-
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_zh_TW.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_zh_TW.properties
deleted file mode 100644
index 19db6e81ff..0000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_zh_TW.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=\u900f\u904e <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a> \u555f\u52d5 Slave \u4ee3\u7406\u7a0b\u5f0f\u3002\
-  \u7531 Slave \u4e3b\u52d5\u7684\u555f\u52d5\u65b9\u5f0f\uff0cMaster \u4e0d\u7528\u76f4\u63a5 IP \u9023\u7dda\u5230 Slave (\u4f8b\u5982\u5728\u9632\u706b\u7246\u5f8c)\u3002\
-  \u9019\u7a2e\u65b9\u5f0f\u4e00\u6a23\u53ef\u4ee5\u4e0d\u900f\u904e GUI \u555f\u52d5\uff0c\u4f8b\u5982\u5b89\u88dd\u6210 Windows \u670d\u52d9\u3002
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
index 1e99285e5c..e371a9b040 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
     <j:when test="${it.offline and !it.temporarilyOffline}">
       <j:if test="${h.hasPermission(it, it.CONNECT)}">
         <p>
-          ${%Connect slave to Jenkins one of these ways:}
+          ${%Connect agent to Jenkins one of these ways:}
         </p>
         <ul>
           <li>
@@ -42,20 +42,20 @@ THE SOFTWARE.
               <a href="slave-agent.jnlp" id="jnlp-link">
                 <img src="${imagesURL}/webstart.gif" alt="${%launch agent}" />
               </a>
-              ${%Launch agent from browser on slave}
+              ${%Launch agent from browser}
             </p>
           </li>
           <j:choose>
             <j:when test="${it.ACL.hasPermission(app.ANONYMOUS, it.CONNECT)}">
               <li>
                 <p>
-                  ${%Run from slave command line:}
+                  ${%Run from agent command line:}
                 </p>
                 <pre>javaws ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
               </li>
               <li>
                 <p>
-                  ${%Or if the slave is headless:}
+                  ${%Or if the agent is headless:}
                 </p>
                 <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
               </li>
@@ -63,7 +63,7 @@ THE SOFTWARE.
             <j:otherwise>
               <li>
                 <p>
-                  ${%Run from slave command line:}
+                  ${%Run from agent command line:}
                 </p>
                 <!-- TODO conceal secret w/ JS if possible -->
                 <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret ${it.jnlpMac}</pre>
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
index b73c1bc2b2..d4770fa4c7 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-slaveAgentPort.disabled=TCP port for JNLP slave agents is disabled.
 configure.link.text=Go to security configuration screen and change it
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_da.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_da.properties
index af983756bd..e34b1b1c53 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_da.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_da.properties
@@ -20,10 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Forbind Jenkins til slaver p\u00e5 en af f\u00f8lgende m\u00e5der:
 launch\ agent=start agent
 Connected\ via\ JNLP\ agent.=Forbundet via JNLP agent.
-Or\ if\ the\ slave\ is\ headless\:=Eller hvis slaven er hovedl\u00f8s:
-Run\ from\ slave\ command\ line\:=K\u00f8r fra slavens kommandolinje:
-slaveAgentPort.disabled=TCP port for JNLP slave agent er sl\u00e5et fra.
-Launch\ agent\ from\ browser\ on\ slave=Start agent fra browser p\u00e5 slaven
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_de.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_de.properties
index c3c9a4be4a..80908374b0 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_de.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_de.properties
@@ -20,11 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-slaveAgentPort.disabled=TCP-Port f�r JNLP-Slaves ist deaktiviert.
 configure.link.text=Zur globalen Sicherheitskonfiguration wechseln und �ndern
-Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Der Slave kann eine Verbindung zum Jenkins-Master mit einer der folgenden M�glichkeiten aufbauen:
 launch\ agent=Agent starten
-Launch\ agent\ from\ browser\ on\ slave=Agent aus einem Webbrowser auf den Slave starten
-Run\ from\ slave\ command\ line\:=Agent aus der Kommandozeile heraus starten:
-Or\ if\ the\ slave\ is\ headless\:=Oder falls der Slave keine GUI anbietet ("headless"-Modus):
 Connected\ via\ JNLP\ agent.=Verbunden �ber JNLP-Agent.
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_es.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_es.properties
index b47a4cb7bd..390cf03a39 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_es.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_es.properties
@@ -20,11 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-slaveAgentPort.disabled=El puerto TCP para los agentes esclavos via JNLP est� deshabilitado.
+slaveAgentPort.disabled=El puerto TCP para los agentes via JNLP est� deshabilitado.
 launch\ agent=Lanzar agente
-Or\ if\ the\ slave\ is\ headless\:=O si el esclavo no tiene pantalla
-Run\ from\ slave\ command\ line\:=Ejecutar desde la l�nea de comandos del esclavo
-Launch\ agent\ from\ browser\ on\ slave=Lanzar el agente desde el navegador en el esclavo
-Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Conectar el esclavo a Jenkins usando uno de estos m�todos
+Or\ if\ the\ agent\ is\ headless\:=O si el agente no tiene pantalla
+Run\ from\ agent\ command\ line\:=Ejecutar agente desde la l�nea de comandos del nodo
+Launch\ agent\ from\ browser=Lanzar el agente desde el navegador en el nodo
+Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways\:=Conectar el agente a Jenkins usando uno de estos m�todos
 Connected\ via\ JNLP\ agent.=Conectado a trav�s del agente JNLP
 
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_fr.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_fr.properties
index d8483c0298..e0bca578cf 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_fr.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_fr.properties
@@ -20,9 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-slaveAgentPort.disabled=Le port TCP pour l''esclave JNLP est d\u00E9sactiv\u00E9.
-Launch\ agent\ from\ browser\ on\ slave=Lancer l''agent \u00E0 partir du navigateur sur l''esclave
-Run\ from\ slave\ command\ line:=Ex\u00E9cuter l''esclave \u00E0 partir de l\u2019interpr\u00E8te de commandes
+Run\ from\ agent\ command\ line:=Ex\u00E9cuter l''esclave \u00E0 partir de l\u2019interpr\u00E8te de commandes
 launch\ agent=lancer l''agent
-Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways:=Connecter l''esclave \u00E0 Jenkins avec l''une des mani\u00E8res suivantes:
+Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways:=Connecter l''esclave \u00E0 Jenkins avec l''une des mani\u00E8res suivantes:
 Connected\ via\ JNLP\ agent.=Connect\u00E9 via l\u2019agent JNLP.
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_ja.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_ja.properties
index 224e551095..49e9af614f 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_ja.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_ja.properties
@@ -20,11 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-slaveAgentPort.disabled=JNLP\u30b9\u30ec\u30fc\u30d6\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u7528\u306eTCP\u30dd\u30fc\u30c8\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
-Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=\u6b21\u306e\u3044\u305a\u308c\u304b\u306e\u65b9\u6cd5\u3067\u30b9\u30ec\u30fc\u30d6\u3092Jenkins\u306b\u63a5\u7d9a\u3057\u307e\u3059\u3002
 launch\ agent=\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306e\u8d77\u52d5
-Launch\ agent\ from\ browser\ on\ slave=\u30b9\u30ec\u30fc\u30d6\u4e0a\u306e\u30d6\u30e9\u30a6\u30b6\u304b\u3089\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3092\u8d77\u52d5
-Run\ from\ slave\ command\ line\:=\u30b9\u30ec\u30fc\u30d6\u3067\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u304b\u3089\u8d77\u52d5:
-Or\ if\ the\ slave\ is\ headless\:=\u3082\u3057\u304f\u306f\u3001\u30b9\u30ec\u30fc\u30d6\u3067X\u304c\u8d77\u52d5\u3057\u3066\u3044\u306a\u3044\u5834\u5408:
 Connected\ via\ JNLP\ agent.=JNLP\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u7d4c\u7531\u3067\u63a5\u7d9a
-configure.link.text=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u8a2d\u5b9a\u30da\u30fc\u30b8\u3067\u5909\u66f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002
\ No newline at end of file
+configure.link.text=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u8a2d\u5b9a\u30da\u30fc\u30b8\u3067\u5909\u66f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties
index a20ddaa4b9..af9f3c2747 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties
@@ -20,13 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Or\ if\ the\ slave\ is\ headless\:=Ou, se o slave \u00e9 sem master
-Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Conecta slave ao Jenkins por uma dessas maneiras:
-Run\ from\ slave\ command\ line\:=Executar comando de linha pelo slave
 launch\ agent=Lan\u00e7ar agente
 # TCP port for JNLP slave agents is disabled.
 slaveAgentPort.disabled=Porta TCP para JNLP est\u00e1 desativada
-Launch\ agent\ from\ browser\ on\ slave=Lan\u00e7ar agente de um navegador do slave
 Connected\ via\ JNLP\ agent.=Conectado via JNLP agente.
 # Go to security configuration screen and change it
 configure.link.text=V\u00e1 para a p\u00e1gina de configura\u00e7\u00e3o de seguran\u00e7a para alterar
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_ru.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_ru.properties
index ce15ab9cf4..0fc4329cd2 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_ru.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_ru.properties
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways:=\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0438\u0442\u044C slave \u043A Jenkins \u043E\u0434\u043D\u0438\u043C \u0438\u0437 \u0441\u043F\u043E\u0441\u043E\u0431\u043E\u0432:
 Connected\ via\ JNLP\ agent.=\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D \u0447\u0435\u0440\u0435\u0437 JNLP \u0430\u0433\u0435\u043D\u0442\u0430.
-Launch\ agent\ from\ browser\ on\ slave=\u0417\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0430\u0433\u0435\u043D\u0442\u0430 \u0438\u0437 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0430 \u043D\u0430 slave
-Run\ from\ slave\ command\ line:=\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0432 \u043A\u043E\u043C\u043C\u0430\u043D\u0434\u043D\u043E\u0439 \u0441\u0442\u0440\u043E\u043A\u0435 \u043F\u043E\u0434\u0447\u0438\u043D\u0435\u043D\u043D\u043E\u0433\u043E \u0443\u0437\u043B\u0430
+Run\ from\ agent\ command\ line:=\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0432 \u043A\u043E\u043C\u043C\u0430\u043D\u0434\u043D\u043E\u0439 \u0441\u0442\u0440\u043E\u043A\u0435 \u043F\u043E\u0434\u0447\u0438\u043D\u0435\u043D\u043D\u043E\u0433\u043E \u0443\u0437\u043B\u0430
 launch\ agent=\u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0430\u0433\u0435\u043D\u0442\u0430
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_zh_TW.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_zh_TW.properties
index 821a4ee9cb..7c50bf1b26 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_zh_TW.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_zh_TW.properties
@@ -20,10 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-slaveAgentPort.disabled=JNLP Slave \u4ee3\u7406\u7a0b\u5f0f\u7684 TCP \u9023\u63a5\u57e0\u5df2\u95dc\u9589\u3002
-Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=\u53ef\u4ee5\u7528\u4e0b\u9762\u9019\u4e9b\u65b9\u6cd5\u5c07 Slave \u9023\u5230 Jenkins:
 launch\ agent=\u555f\u52d5\u4ee3\u7406\u7a0b\u5f0f
-Launch\ agent\ from\ browser\ on\ slave=\u5728 Slave \u7684\u700f\u89bd\u5668\u4e0a\u555f\u52d5\u4ee3\u7406\u7a0b\u5f0f
-Run\ from\ slave\ command\ line\:=\u7531 Slave \u547d\u4ee4\u5217\u57f7\u884c:
-Or\ if\ the\ slave\ is\ headless\:=\u5982\u679c Slave \u6c92\u6709\u5468\u908a:
 Connected\ via\ JNLP\ agent.=\u5C07\u7531 JNLP \u4EE3\u7406\u7A0B\u5F0F\u5EFA\u7ACB\u9023\u7DDA\u3002
diff --git a/core/src/main/resources/hudson/slaves/Messages.properties b/core/src/main/resources/hudson/slaves/Messages.properties
index 7f55e6ed66..c3a247c284 100644
--- a/core/src/main/resources/hudson/slaves/Messages.properties
+++ b/core/src/main/resources/hudson/slaves/Messages.properties
@@ -20,21 +20,21 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-RetentionStrategy.Always.displayName=Keep this slave on-line as much as possible
-RetentionStrategy.Demand.displayName=Take this slave on-line when in demand and off-line when idle
+RetentionStrategy.Always.displayName=Keep this agent online as much as possible
+RetentionStrategy.Demand.displayName=Take this agent online when in demand, and offline when idle
 RetentionStrategy.Demand.OfflineIdle=Offline because computer was idle; it will be relaunched when needed.
-CommandLauncher.displayName=Launch slave via execution of command on the Master
-JNLPLauncher.displayName=Launch slave agents via Java Web Start
-ComputerLauncher.unexpectedError=Unexpected error in launching a slave. This is probably a bug in Jenkins
-ComputerLauncher.abortedLaunch=Launching slave process aborted.
+CommandLauncher.displayName=Launch agent via execution of command on the master
+JNLPLauncher.displayName=Launch agent via Java Web Start
+ComputerLauncher.unexpectedError=Unexpected error in launching an agent. This is probably a bug in Jenkins
+ComputerLauncher.abortedLaunch=Launching agent process aborted.
 CommandLauncher.NoLaunchCommand=No launch command specified
 ConnectionActivityMonitor.OfflineCause=Repeated ping attempts failed
-DumbSlave.displayName=Dumb Slave
+DumbSlave.displayName=Permanent Agent
 NodeProvisioner.EmptyString=
-OfflineCause.LaunchFailed=This node is offline because Jenkins failed to launch the slave agent on it.
+OfflineCause.LaunchFailed=This agent is offline because Jenkins failed to launch the agent process on it.
 OfflineCause.connection_was_broken_=Connection was broken: {0}
 SimpleScheduledRetentionStrategy.FinishedUpTime=Computer has finished its scheduled uptime
-SimpleScheduledRetentionStrategy.displayName=Take this slave on-line according to a schedule
+SimpleScheduledRetentionStrategy.displayName=Take this agent online according to a schedule
 EnvironmentVariablesNodeProperty.displayName=Environment variables
 SlaveComputer.DisconnectedBy=Disconnected by {0}{1}
 NodeDescripter.CheckName.Mandatory=Name is mandatory
diff --git a/core/src/main/resources/hudson/slaves/Messages_bg.properties b/core/src/main/resources/hudson/slaves/Messages_bg.properties
index dccd5efbbd..bba31466f4 100644
--- a/core/src/main/resources/hudson/slaves/Messages_bg.properties
+++ b/core/src/main/resources/hudson/slaves/Messages_bg.properties
@@ -20,38 +20,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-RetentionStrategy.Always.displayName=\
- \u0422\u043e\u0437\u0438 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u0434\u0430 \u0435 \u0432\u044a\u0437\u043c\u043e\u0436\u043d\u043e \u043d\u0430\u0439-\u0434\u044a\u043b\u0433\u043e \u043d\u0430 \u043b\u0438\u043d\u0438\u044f.
-RetentionStrategy.Demand.displayName=\
- \u0422\u043e\u0437\u0438 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u0434\u0430 \u0435 \u043d\u0430 \u043b\u0438\u043d\u0438\u044f \u043f\u0440\u0438 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e\u0441\u0442 \u0438 \u0438\u0437\u043a\u043b\u044e\u0447\u0435\u043d \u0432 \u0434\u0440\u0443\u0433\u043e\u0442\u043e\
- \u0432\u0440\u0435\u043c\u0435.
 RetentionStrategy.Demand.OfflineIdle=\
  \u041d\u0435 \u0435 \u043d\u0430 \u043b\u0438\u043d\u0438\u044f, \u0437\u0430\u0449\u043e\u0442\u043e \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440\u044a\u0442 \u0431\u0435\u0437\u0434\u0435\u0439\u0441\u0442\u0432\u0430. \u0429\u0435 \u0441\u0435 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430 \u043f\u0440\u0438 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e\u0441\u0442.
-CommandLauncher.displayName=\
- \u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u044f \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440 \u0447\u0440\u0435\u0437 \u043a\u043e\u043c\u0430\u043d\u0434\u0430 \u043e\u0442 \u043e\u0441\u043d\u043e\u0432\u043d\u0438\u044f.
-JNLPLauncher.displayName=\
- \u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u044f Jenkins \u0447\u0440\u0435\u0437 Java Web Start
-ComputerLauncher.unexpectedError=\
- \u041d\u0435\u043e\u0447\u0430\u043a\u0432\u0430\u043d\u0430 \u0433\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u044f Jenkins. \u0422\u043e\u0432\u0430 \u0432\u0435\u0440\u043e\u044f\u0442\u043d\u043e \u0435\
- \u0433\u0440\u0435\u0448\u043a\u0430 \u0432 \u0441\u0430\u043c\u0438\u044f Jenkins
-ComputerLauncher.abortedLaunch=\
- \u041f\u0440\u0435\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0435\u043d\u043e \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u044f Jenkins.
 CommandLauncher.NoLaunchCommand=\
  \u041d\u0435 \u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430 \u0437\u0430 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435.
 ConnectionActivityMonitor.OfflineCause=\
  \u041c\u043d\u043e\u0433\u043e\u043a\u0440\u0430\u0442\u043d\u0438\u0442\u0435 \u043e\u043f\u0438\u0442\u0438 \u0437\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u0447\u0440\u0435\u0437 \u043a\u043e\u043c\u0430\u043d\u0434\u0430\u0442\u0430 \u201eping\u201c \u0441\u0430 \u043d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u0438
-DumbSlave.displayName=\
- \u0418\u0437\u0446\u044f\u043b\u043e \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d Jenkins
 NodeProvisioner.EmptyString=
-OfflineCause.LaunchFailed=\
- \u041c\u0430\u0448\u0438\u043d\u0430\u0442\u0430 \u0435 \u0434\u043e\u043a\u043b\u0430\u0434\u0432\u0430\u043d\u0430 \u043a\u0430\u0442\u043e \u0438\u0437\u043a\u043b\u044e\u0447\u0435\u043d\u0430, \u0437\u0430\u0449\u043e\u0442\u043e \u043e\u043f\u0438\u0442\u044a\u0442 \u0437\u0430 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\
- \u043f\u0440\u043e\u0446\u0435\u0441 \u043d\u0430 Jenkins \u0431\u0435 \u043d\u0435\u0443\u0441\u043f\u0435\u0448\u0435\u043d.
 OfflineCause.connection_was_broken_=\
  \u0412\u0440\u044a\u0437\u043a\u0430\u0442\u0430 \u0431\u0435 \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0430\u0442\u0430: {0}
 SimpleScheduledRetentionStrategy.FinishedUpTime=\
  \u041a\u043e\u043c\u043f\u044e\u0442\u044a\u0440\u044a\u0442 \u043f\u0440\u0438\u0432\u044a\u0440\u0448\u0438 \u043f\u043b\u0430\u043d\u0438\u0440\u0430\u043d\u043e\u0442\u043e \u0432\u0440\u0435\u043c\u0435 \u0437\u0430 \u0440\u0430\u0431\u043e\u0442\u0430
-SimpleScheduledRetentionStrategy.displayName=\
- \u0412\u043a\u043b\u044e\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u044f Jenkins \u043f\u043e \u043f\u043b\u0430\u043d
 EnvironmentVariablesNodeProperty.displayName=\
  \u041f\u0440\u043e\u043c\u0435\u043d\u043b\u0438\u0432\u0438 \u043d\u0430 \u0441\u0440\u0435\u0434\u0430\u0442\u0430
 SlaveComputer.DisconnectedBy=\
diff --git a/core/src/main/resources/hudson/slaves/Messages_da.properties b/core/src/main/resources/hudson/slaves/Messages_da.properties
index dc7acae2fd..ab97271a14 100644
--- a/core/src/main/resources/hudson/slaves/Messages_da.properties
+++ b/core/src/main/resources/hudson/slaves/Messages_da.properties
@@ -20,19 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-SimpleScheduledRetentionStrategy.displayName=Bring denne slave online efter en tidsplan
-RetentionStrategy.Always.displayName=Hold denne slave online s\u00e5 meget som muligt
 RetentionStrategy.Demand.OfflineIdle=Offline da computeren var i tomgang; vil blive genstartet n\u00e5r n\u00f8dvendigt.
 SimpleScheduledRetentionStrategy.FinishedUpTime=Computeren har afsluttet sin planlagte oppetid
 EnvironmentVariablesNodeProperty.displayName=Milj\u00f8variable
-DumbSlave.displayName=Dum Slave
-ComputerLauncher.abortedLaunch=Opstart af slaveproces afbrudt.
-JNLPLauncher.displayName=Start slaveagenter via JNLP
 CommandLauncher.NoLaunchCommand=Ingen opstartskommando givet
 ConnectionActivityMonitor.OfflineCause=Gentagne pingfors\u00f8g fejlede
-OfflineCause.LaunchFailed=Denne node er offline da Jenkins ikke kunne starte slaveagenten p\u00e5 den.
-RetentionStrategy.Demand.displayName=Bring denne slavenode online efter behov, og offline n\u00e5r i tomgang
-CommandLauncher.displayName=Start slave ved at k\u00f8re en kommando p\u00e5 master''en
 SlaveComputer.DisconnectedBy=Frakoblet af {0}{1}
-ComputerLauncher.unexpectedError=Uforudset fejl under slaveopstart. Dette skyldes formentlig en fejl i Jenkins
 NodeProvisioner.EmptyString=
diff --git a/core/src/main/resources/hudson/slaves/Messages_de.properties b/core/src/main/resources/hudson/slaves/Messages_de.properties
index e1a50ba293..39ae4cf2d0 100644
--- a/core/src/main/resources/hudson/slaves/Messages_de.properties
+++ b/core/src/main/resources/hudson/slaves/Messages_de.properties
@@ -21,18 +21,7 @@
 # THE SOFTWARE.
 
 ConnectionActivityMonitor.OfflineCause=Ping-Versuche scheiterten wiederholt
-RetentionStrategy.Always.displayName=Slave immer angeschaltet lassen
-RetentionStrategy.Demand.displayName=Slave nur bei Bedarf anschalten, ansonsten abschalten
-RetentionStrategy.Demand.OfflineIdle=Slave war im Leerlauf
-CommandLauncher.displayName=Starte Slave durch Ausf�hrung eines Kommandos auf dem Master
-JNLPLauncher.displayName=Starte Slave-Agenten �ber JNLP
-ComputerLauncher.unexpectedError=Unerwarteter Fehler beim Starten eines Slave-Prozesses aufgetreten. Vermutlich handelt es sich um einen Fehler in Jenkins.
-ComputerLauncher.abortedLaunch=Start eines Slave-Prozesses abgebrochen.
 CommandLauncher.NoLaunchCommand=Kein Startkommando angegeben.
-DumbSlave.displayName=Dumb slave
-OfflineCause.LaunchFailed=Dieser Knoten ist nicht verf�gbar, weil Jenkins den Slave nicht starten konnte.
-SimpleScheduledRetentionStrategy.displayName=Slave zeitgesteuert anschalten
-SimpleScheduledRetentionStrategy.FinishedUpTime=Slave hat seine geplante Online-Zeit beendet.
 EnvironmentVariablesNodeProperty.displayName=Umgebungsvariablen
 NodeProvisioner.EmptyString=
 SlaveComputer.DisconnectedBy=Getrennt durch Benutzer {0}{1}
diff --git a/core/src/main/resources/hudson/slaves/Messages_es.properties b/core/src/main/resources/hudson/slaves/Messages_es.properties
index 3b70c0bce8..e12811db84 100644
--- a/core/src/main/resources/hudson/slaves/Messages_es.properties
+++ b/core/src/main/resources/hudson/slaves/Messages_es.properties
@@ -20,19 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-RetentionStrategy.Always.displayName=Mantener este nodo en l�nea el m�ximo de tiempo posible
-RetentionStrategy.Demand.displayName=Poner este nodo en l�nea cuando haya demanda, y fuera de l�nea cuando no hayan trabajos
 RetentionStrategy.Demand.OfflineIdle=Fuera de l�nea porque no es necesario, el servicio se volver� a iniciar cuando haya demanda
-CommandLauncher.displayName=Arrancar el nodo ejecutando un comando desde el nodo principal
-JNLPLauncher.displayName=Ejecutar el agente en el nodo secundario utilizando JNLP
-ComputerLauncher.unexpectedError=Error inesperado al lanzar un nodo secundario. Posiblemente sea un error de Jenkins (bug)
-ComputerLauncher.abortedLaunch=El inicio del agente en el nodo secundario ha sido abortado.
 CommandLauncher.NoLaunchCommand=No se ha especificado ning�n comando
 ConnectionActivityMonitor.OfflineCause=No hubo respuesta a ''ping'' despues de varios intentos
-DumbSlave.displayName=Secundario pasivo
-OfflineCause.LaunchFailed=Este nodo est� fuera de l�nea porque Jenkins no pudo iniciar el agente esclavo.
 SimpleScheduledRetentionStrategy.FinishedUpTime=El nodo ha finalizado el tiempo programado de estar on-line
-SimpleScheduledRetentionStrategy.displayName=Programar cu�ndo se debe poner este nodo secundario en l�nea.
 EnvironmentVariablesNodeProperty.displayName=Variables de entorno
 SlaveComputer.DisconnectedBy=Desconectado por {0}{1}
 NodeProvisioner.EmptyString= 
diff --git a/core/src/main/resources/hudson/slaves/Messages_fr.properties b/core/src/main/resources/hudson/slaves/Messages_fr.properties
index bbf3373322..d044dac640 100644
--- a/core/src/main/resources/hudson/slaves/Messages_fr.properties
+++ b/core/src/main/resources/hudson/slaves/Messages_fr.properties
@@ -20,14 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-RetentionStrategy.Always.displayName=Garder cet esclave en ligne autant que possible
-RetentionStrategy.Demand.displayName=Mettre cet esclave en ligne \u00e0 la demande et hors-ligne si inutilis\u00e9
-CommandLauncher.displayName=Lancer l''esclave via l''ex\u00e9cution d''une commande sur le ma\u00eetre
-JNLPLauncher.displayName=Lancer les agents esclaves par JNLP
-ComputerLauncher.unexpectedError=Erreur inattendue au lancement d''un esclave. Probablement un bug dans Jenkins
-ComputerLauncher.abortedLaunch=Lancement de l''esclave annul\u00e9.
 CommandLauncher.NoLaunchCommand=Aucune commande de lancement sp\u00e9cifi\u00e9e
-DumbSlave.displayName=Esclave passif
-OfflineCause.LaunchFailed=Ce noeud est d\u00e9connect\u00e9 parce que Jenkins n''a pas r\u00e9ussi \u00e0 lancer l''agent esclave dessus.
-SimpleScheduledRetentionStrategy.displayName=D\u00e9connecte cet esclave selon des horaires
 EnvironmentVariablesNodeProperty.displayName=Variables d''environnement
diff --git a/core/src/main/resources/hudson/slaves/Messages_ja.properties b/core/src/main/resources/hudson/slaves/Messages_ja.properties
index c8eeb5f762..a5bf2adebc 100644
--- a/core/src/main/resources/hudson/slaves/Messages_ja.properties
+++ b/core/src/main/resources/hudson/slaves/Messages_ja.properties
@@ -20,20 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-RetentionStrategy.Always.displayName=\u53ef\u80fd\u306a\u9650\u308a\u30aa\u30f3\u30e9\u30a4\u30f3\u306e\u307e\u307e\u306b\u3059\u308b
-RetentionStrategy.Demand.displayName=\u8981\u6c42\u6642\u306b\u306f\u30aa\u30f3\u30e9\u30a4\u30f3\u306b\u3057\u3001\u5f85\u6a5f\u4e2d\u306b\u306f\u30aa\u30d5\u30e9\u30a4\u30f3\u306b\u3059\u308b
 RetentionStrategy.Demand.OfflineIdle=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u304c\u5f85\u6a5f\u4e2d\u306a\u306e\u3067\u30aa\u30d5\u30e9\u30a4\u30f3\u3067\u3059\u3002\u5fc5\u8981\u306b\u306a\u3063\u305f\u3089\u518d\u3073\u8d77\u52d5\u3057\u307e\u3059\u3002
-CommandLauncher.displayName=\u30de\u30b9\u30bf\u30fc\u3067\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u3066\u30b9\u30ec\u30fc\u30d6\u3092\u8d77\u52d5
-JNLPLauncher.displayName=JNLP\u7d4c\u7531\u3067\u30b9\u30ec\u30fc\u30d6\u3092\u8d77\u52d5
-ComputerLauncher.unexpectedError=\u30b9\u30ec\u30fc\u30d6\u306e\u8d77\u52d5\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u3053\u308c\u306f\u305f\u3076\u3093Jenkins\u306e\u30d0\u30b0\u3067\u3059\u3002
-ComputerLauncher.abortedLaunch=\u30b9\u30ec\u30fc\u30d6\u306e\u8d77\u52d5\u30d7\u30ed\u30bb\u30b9\u304c\u4e2d\u65ad\u3057\u307e\u3057\u305f\u3002
 CommandLauncher.NoLaunchCommand=\u8d77\u52d5\u30b3\u30de\u30f3\u30c9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 ConnectionActivityMonitor.OfflineCause=\u4f55\u5ea6\u3082ping\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-DumbSlave.displayName=\u30c0\u30e0\u30b9\u30ec\u30fc\u30d6
 NodeProvisioner.EmptyString=
-OfflineCause.LaunchFailed=\u30b9\u30ec\u30fc\u30d6\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u305f\u305f\u3081\u3001\u3053\u306e\u30ce\u30fc\u30c9\u306f\u30aa\u30d5\u30e9\u30a4\u30f3\u3067\u3059\u3002
 SimpleScheduledRetentionStrategy.FinishedUpTime=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u306e\u52d5\u4f5c\u53ef\u80fd\u6642\u9593\u304c\u7d42\u4e86\u3057\u307e\u3057\u305f\u3002
-SimpleScheduledRetentionStrategy.displayName=\u30b9\u30b1\u30b8\u30e5\u30fc\u30eb\u306b\u5f93\u3063\u3066\u30aa\u30f3\u30e9\u30a4\u30f3\u306b\u3059\u308b
 EnvironmentVariablesNodeProperty.displayName=\u74b0\u5883\u5909\u6570
 SlaveComputer.DisconnectedBy={0}\u304c\u30aa\u30d5\u30e9\u30a4\u30f3\u306b\u3057\u3066\u3044\u307e\u3059\u3002{1}
 NodeDescripter.CheckName.Mandatory=\u30ce\u30fc\u30c9\u540d\u306f\u5fc5\u9808\u3067\u3059\u3002
diff --git a/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties b/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties
index 090702e659..9cd2f871d9 100644
--- a/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties
@@ -20,16 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-RetentionStrategy.Always.displayName=Manter este slave ligado tanto quanto for poss\u00edvel
-RetentionStrategy.Demand.displayName=Deixar este slave ligado quando em demanda e desligado quando inativo
-CommandLauncher.displayName=Lan\u00e7ar o slave via execu\u00e7\u00e3o de comando no Master
-JNLPLauncher.displayName=Lan\u00e7ar os agentes slave via JNLP
-ComputerLauncher.unexpectedError=Erro ErrorUnexpected no lan\u00e7amento de um slave. Este \u00e9 provavelmente um bug no Jenkins
-ComputerLauncher.abortedLaunch=Processo de lan\u00e7amento de slave abortado.
-# Take this slave on-line according to a schedule
-SimpleScheduledRetentionStrategy.displayName=Colocar o slave online de acordo com o agendamento
-# This node is offline because Jenkins failed to launch the slave agent on it.
-OfflineCause.LaunchFailed=Esse n\u00f3 est\u00e1 offline porque Jenkins falhou ao lan\u00e7ar o agente slave
 # No launch command specified
 CommandLauncher.NoLaunchCommand=Sem nenhum comando de lan\u00e7amento especificado
 # Offline because computer was idle; it will be relaunched when needed.
@@ -43,8 +33,6 @@ SimpleScheduledRetentionStrategy.FinishedUpTime=O computador terminou o seu temp
 NodeProvisioner.EmptyString=
 # Environment variables
 EnvironmentVariablesNodeProperty.displayName=Vari\u00e1veis de ambiente
-# Dumb Slave
-DumbSlave.displayName=Slave burro
 # Java version {0} was found but 1.6 or later is needed.
 ComputerLauncher.NoJavaFound=A vers\u00e3o {0} do Java foi encontrada, mas a vers\u00e3o 1.6 ou mais nova \u00e9 necess\u00e1ria.
 # Couldn\u2019t figure out the Java version of {0}
diff --git a/core/src/main/resources/hudson/slaves/Messages_tr.properties b/core/src/main/resources/hudson/slaves/Messages_tr.properties
deleted file mode 100644
index 316c3dd85c..0000000000
--- a/core/src/main/resources/hudson/slaves/Messages_tr.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-RetentionStrategy.Always.displayName=Bu slave''i m\u00fcmk\u00fcn oldu\u011funca on-line konumda tut
-RetentionStrategy.Demand.displayName=Bu slave''i ihtiya\u00e7 an\u0131nda on-line, bekleme durumlar\u0131nda off-line konuma getir.
-CommandLauncher.displayName=Master''da \u00e7al\u0131\u015ft\u0131r\u0131lan bir komut ile bu slave''i harekete ge\u00e7ir
-JNLPLauncher.displayName=JNLP yard\u0131m\u0131 ile slave ajan\u0131 harekete ge\u00e7ir
-ComputerLauncher.unexpectedError=Slave harekete ge\u00e7irilirken umulmad\u0131k bir hata olu\u015ftu. Jenkins''daki bir bug''dan dolay\u0131 olabilir.
-ComputerLauncher.abortedLaunch=Slave''i harekete ge\u00e7irme i\u015flemi iptal edildi.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/Messages_zh_TW.properties b/core/src/main/resources/hudson/slaves/Messages_zh_TW.properties
index c7fb50e753..833fe20313 100644
--- a/core/src/main/resources/hudson/slaves/Messages_zh_TW.properties
+++ b/core/src/main/resources/hudson/slaves/Messages_zh_TW.properties
@@ -20,29 +20,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-CommandLauncher.displayName=\u5728 Master \u4e0a\u57f7\u884c\u6307\u4ee4\u555f\u52d5 Slave
 CommandLauncher.NoLaunchCommand=\u6c92\u6709\u6307\u5b9a\u555f\u52d5\u6307\u4ee4
 
-ComputerLauncher.abortedLaunch=Slave \u555f\u52d5\u7a0b\u5e8f\u5df2\u4e2d\u6b62\u3002
-ComputerLauncher.unexpectedError=\u555f\u52d5 Slave \u6642\u767c\u751f\u9810\u671f\u5916\u7684\u932f\u8aa4\u3002\u53ef\u80fd\u662f Jenkins \u672c\u8eab\u7684 Bug
 ComputerLauncher.JavaVersionResult={0} -version \u56de\u50b3 {1}\u3002
 ComputerLauncher.NoJavaFound=\u627e\u5230 Java {0} \u7248\uff0c\u4e0d\u904e\u6211\u5011\u8981\u7684\u662f 1.5 \u6216\u66f4\u65b0\u7684\u7248\u672c\u3002
 ComputerLauncher.UknownJavaVersion=\u4e0d\u77e5\u9053 {0} \u7684 Java \u7248\u672c
 
 ConnectionActivityMonitor.OfflineCause=\u91cd\u8907 Ping \u5931\u6557
 
-DumbSlave.displayName=\u967d\u6625 Slave
 EnvironmentVariablesNodeProperty.displayName=\u74b0\u5883\u8b8a\u6578
-JNLPLauncher.displayName=\u900f\u904e Java Web Start \u555f\u52d5 Slave \u4ee3\u7406\u7a0b\u5f0f
 NodeDescripter.CheckName.Mandatory=\u4e00\u5b9a\u8981\u8f38\u5165\u540d\u7a31
 
-OfflineCause.LaunchFailed=\u7bc0\u9ede\u96e2\u7dda\uff0c\u56e0\u70ba Jenkins \u7121\u6cd5\u555f\u52d5\u4e0a\u9762\u7684 Slave \u4ee3\u7406\u7a0b\u5f0f\u3002
 
-RetentionStrategy.Always.displayName=\u76e1\u53ef\u80fd\u8b93 Slave \u4e0a\u7dda
 RetentionStrategy.Demand.OfflineIdle=\u96fb\u8166\u9592\u7f6e\u96e2\u7dda\uff0c\u9700\u8981\u6642\u624d\u6703\u88ab\u555f\u52d5\u3002
-RetentionStrategy.Demand.displayName=\u9700\u8981\u6642\u624d\u8b93 Slave \u4e0a\u7dda\uff0c\u9592\u7f6e\u6642\u5c31\u96e2\u7dda\u3002
 
-SimpleScheduledRetentionStrategy.displayName=\u4f9d\u64da\u6392\u7a0b\u8b93 Slave \u4e0a\u7dda
 SimpleScheduledRetentionStrategy.FinishedUpTime=\u96fb\u8166\u5df2\u7d93\u505a\u6eff\u4e86\u6392\u5b9a\u7684\u4e0a\u7dda\u6642\u9593
 
 SlaveComputer.DisconnectedBy=\u7531 {0} \u4e2d\u65b7\u9023\u7dda{1}
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly
index e06ed7537b..3ef03e52aa 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly
@@ -35,7 +35,7 @@ THE SOFTWARE.
                name="retentionStrategy.upTimeMins" value="${instance.upTimeMins}"
                checkMessage="${%Scheduled Uptime is mandatory and must be a number.}"/>
     </f:entry>
-    <f:entry title="${%Keep on-line while jobs are running}">
+    <f:entry title="${%Keep online while jobs are running}"  help="/help/system-config/master-slave/demand/keepUpWhenActive.html">
       <f:checkbox name="retentionStrategy.keepUpWhenActive" checked="${h.defaultToTrue(instance.keepUpWhenActive)}"/>
     </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_da.properties b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_da.properties
index e7e0e0e452..525c94f6a1 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_da.properties
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_da.properties
@@ -22,6 +22,6 @@
 
 Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.=Planlagt oppetid er obligatorisk og skal v\u00e6re et tal.
 Scheduled\ Uptime=Planlagt oppetid
-Keep\ on-line\ while\ jobs\ are\ running=Hold on-line n\u00e5r jobs k\u00f8rer
+Keep\ online\ while\ jobs\ are\ running=Hold on-line n\u00e5r jobs k\u00f8rer
 Startup\ Schedule=Opstartstidsplan
 uptime.description=Antal minutter noden skal holdes oppe. Hvis dette er l\u00e6ngere end opstartstidsplanen vil noden altid v\u00e6re online.
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_de.properties b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_de.properties
index 35f2482483..6ba64a98e4 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_de.properties
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_de.properties
@@ -23,6 +23,5 @@
 Startup\ Schedule=Anschaltzeitplan
 Scheduled\ Uptime=Verf�gbare Zeit
 Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.=Verf�gbare Zeit muss angegeben werden und eine Zahl sein.
-Keep\ on-line\ while\ jobs\ are\ running=Slave angeschaltet lassen, solange Jobs laufen.
 uptime.description=\
  Dies ist die Zeit in Minuten, die dieser Knoten verf�gbar bleibt. Ist der Zeitraum l�nger als die Zeitabst�nde im Zeitplan, dann ist der Knoten dauerhaft verf�gbar.
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_es.properties b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_es.properties
index 54a97e1b5d..5275f2d573 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_es.properties
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_es.properties
@@ -23,5 +23,5 @@
 Startup\ Schedule=Tiempo de inicio programado
 Scheduled\ Uptime=Tiempo de ejecuci�n programado
 Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.=El tiempo de ejecuci�n programado es obligatorio y debe ser un n�mero
-Keep\ on-line\ while\ jobs\ are\ running=Mantener en l�nea mientras hayan tareas en ejecuci�n
+Keep\ online\ while\ jobs\ are\ running=Mantener en l�nea mientras hayan tareas en ejecuci�n
 uptime.description=El n�mero de minutos para mantener el nodo activo. Si es mayor que el tiempo programado para arrancar, el nodo estar� permanentemente en l�nea
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_fr.properties b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_fr.properties
index 8cadc09c49..7e776863eb 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_fr.properties
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_fr.properties
@@ -24,4 +24,4 @@ Startup\ Schedule=D
 Scheduled\ Uptime=Dur�e du mode actif
 Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.=Le Uptime pr\u00E9vu est obligatoire et doit \u00EAtre un nombre.
 Scheduled\ Uptime\ is\ mandatory.=La dur�e est obligatoire.
-Keep\ on-line\ while\ jobs\ are\ running=Garder actif tant que des jobs sont en cours.
+Keep\ online\ while\ jobs\ are\ running=Garder actif tant que des jobs sont en cours.
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_ja.properties b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_ja.properties
index 28cb24e19e..efbad4f8bd 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_ja.properties
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_ja.properties
@@ -23,6 +23,6 @@
 Startup\ Schedule=\u8D77\u52D5\u30B9\u30B1\u30B8\u30E5\u30FC\u30EB
 Scheduled\ Uptime=\u52D5\u4F5C\u53EF\u80FD\u6642\u9593
 Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.=\u52D5\u4F5C\u53EF\u80FD\u6642\u9593\u306F\u3001\u5FC5\u9808\u304B\u3064\u6570\u5B57\u3067\u3059\u3002
-Keep\ on-line\ while\ jobs\ are\ running=\u30B8\u30E7\u30D6\u8D77\u52D5\u4E2D\u306F\u30AA\u30F3\u30E9\u30A4\u30F3\u3092\u7DAD\u6301
+Keep\ online\ while\ jobs\ are\ running=\u30B8\u30E7\u30D6\u8D77\u52D5\u4E2D\u306F\u30AA\u30F3\u30E9\u30A4\u30F3\u3092\u7DAD\u6301
 uptime.description=\
- \u30CE\u30FC\u30C9\u3092\u30AA\u30F3\u30E9\u30A4\u30F3\u306E\u307E\u307E\u7DAD\u6301\u3059\u308B\u6642\u9593(\u5206)\u3067\u3059\u3002\u3053\u306E\u5024\u304C\u8D77\u52D5\u30B9\u30B1\u30B8\u30E5\u30FC\u30EB\u306E\u9593\u9694\u3088\u308A\u9577\u3051\u308C\u3070\u3001\u30CE\u30FC\u30C9\u306F\u5E38\u306B\u30AA\u30F3\u30E9\u30A4\u30F3\u306E\u307E\u307E\u306B\u306A\u308A\u307E\u3059\u3002\u3000 
\ No newline at end of file
+ \u30CE\u30FC\u30C9\u3092\u30AA\u30F3\u30E9\u30A4\u30F3\u306E\u307E\u307E\u7DAD\u6301\u3059\u308B\u6642\u9593(\u5206)\u3067\u3059\u3002\u3053\u306E\u5024\u304C\u8D77\u52D5\u30B9\u30B1\u30B8\u30E5\u30FC\u30EB\u306E\u9593\u9694\u3088\u308A\u9577\u3051\u308C\u3070\u3001\u30CE\u30FC\u30C9\u306F\u5E38\u306B\u30AA\u30F3\u30E9\u30A4\u30F3\u306E\u307E\u307E\u306B\u306A\u308A\u307E\u3059\u3002\u3000 
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties
index 4022c77170..39bd269660 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties
@@ -25,5 +25,5 @@ Startup\ Schedule=Agenda de inicializa
 # \
 # The number of minutes to keep the node up for. If this is longer than the startup schedule, then the node will remain constantly on-line.
 uptime.description=O n\u00famero de minutos para manter o n\u00f3 no ar
-Keep\ on-line\ while\ jobs\ are\ running=Manter on-line enquanto estiverem rodando jobs
+Keep\ online\ while\ jobs\ are\ running=Manter on-line enquanto estiverem rodando jobs
 Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.=Agenda de uptime \u00e9 obrigat\u00f3ria e precisa ser um n\u00famero.
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_zh_TW.properties b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_zh_TW.properties
index f29f194e2d..87e353f0c6 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_zh_TW.properties
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_zh_TW.properties
@@ -24,4 +24,4 @@ Startup\ Schedule=\u555F\u52D5\u6392\u7A0B
 Scheduled\ Uptime=\u6392\u5B9A\u7684\u904B\u4F5C\u6642\u9593
 uptime.description=\u7BC0\u9EDE\u4E0A\u7DDA\u7684\u5206\u9418\u6578\u3002\u5982\u679C\u8D85\u904E\u4E0B\u6B21\u555F\u52D5\u6392\u7A0B\u7684\u6642\u9593\uFF0C\u9019\u500B\u7BC0\u9EDE\u5C31\u6703\u4E00\u76F4\u5728\u7DDA\u4E0A\u3002
 Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.=\u6392\u5B9A\u7684\u904B\u4F5C\u6642\u9593\u4E00\u5B9A\u8981\u8F38\u5165\u6578\u5B57\u3002
-Keep\ on-line\ while\ jobs\ are\ running=\u9084\u6709 Job \u57F7\u884C\u6642\u4FDD\u6301\u5728\u4E0A\u7DDA\u72C0\u614B
+Keep\ online\ while\ jobs\ are\ running=\u9084\u6709 Job \u57F7\u884C\u6642\u4FDD\u6301\u5728\u4E0A\u7DDA\u72C0\u614B
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/already-launched.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/already-launched.jelly
index 497c61514f..cd905e18ab 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/already-launched.jelly
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/already-launched.jelly
@@ -3,7 +3,7 @@
   <l:layout title="${it.displayName}">
     <st:include page="sidepanel.jelly" />
     <l:main-panel>
-      The slave has been already launched.
+      The agent has been already launched.
     </l:main-panel>
   </l:layout>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_de.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_de.properties
index 4956c0ef8e..a8ed85eac1 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_de.properties
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_de.properties
@@ -24,5 +24,4 @@ disconnect=Trennen
 blurb=\
   Sie k�nnen optional kurz erkl�ren, warum Sie den Knoten abschalten. Dieser Text ist \
   sichtbar f�r andere Benutzer:
-Are\ you\ sure\ about\ disconnecting?=M�chten Sie die Verbindung zum Slave wirklich trennen?
 Yes=Ja
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly
index 9f25865224..3d15dbb245 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly
@@ -37,7 +37,7 @@ THE SOFTWARE.
         codebase="${rootURL}computer/${h.encode(it.node.nodeName)}/">
 
       <information>
-        <title>Slave Agent for ${it.displayName}</title>
+        <title>Agent for ${it.displayName}</title>
         <vendor>Jenkins project</vendor>
         <homepage href="https://jenkins-ci.org/"/>
       </information>
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo.jelly
index f9b93b6e8c..279fc74807 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo.jelly
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
             </j:forEach>
           </j:when>
           <j:otherwise>
-            ${%System Information is unavailable when slave is offline.}
+            ${%System Information is unavailable when agent is offline.}
           </j:otherwise>
         </j:choose>
       </l:hasPermission>
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_ja.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_ja.properties
index 68f9d62e9f..946b7ac4cb 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_ja.properties
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_ja.properties
@@ -21,5 +21,3 @@
 # THE SOFTWARE.
 
 System\ Information=\u30b7\u30b9\u30c6\u30e0\u60c5\u5831
-System\ Information\ is\ unavailable\ when\ slave\ is\ offline.=\
-\u30b9\u30ec\u30fc\u30d6\u304c\u30aa\u30d5\u30e9\u30a4\u30f3\u306e\u5834\u5408\u306b\u306f\u3001\u30b7\u30b9\u30c6\u30e0\u60c5\u5831\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties
index 7ca948edf6..54e0a66aa7 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 System\ Information=Informa\u00e7t\u00e3o de sistema
-System\ Information\ is\ unavailable\ when\ slave\ is\ offline.=As informa\u00e7\u00f5es do sistema n\u00e3o est\u00e3o dispon\u00edveis quando o sistema est\u00e1 offline.
diff --git a/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command.html
index a313706d70..d84dbd5713 100644
--- a/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command.html
+++ b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command.html
@@ -1,4 +1,4 @@
 <div>
-    Command to run on the slave node to install the tool.
+    Command to run on the agent node to install the tool.
     The command will always be run, so it should be a quick no-op if the tool is already installed.
 </div>
diff --git a/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_de.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_de.html
deleted file mode 100644
index c2ea0fec7a..0000000000
--- a/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_de.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-    Kommando, das auf dem Slave ausgeführt wird, um das Hilfsprogramm zu installieren.
-    Dieses Kommando wird bei jedem Build ausgeführt - es sollte also eine schnelle, neutrale Operation sein,
-    wenn das Hilfsprogramm bereits auf dem Slave installiert ist.
-</div>
diff --git a/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_zh_TW.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_zh_TW.html
deleted file mode 100644
index e9d06e036c..0000000000
--- a/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_zh_TW.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-    在 Slave 節點上安裝工具要執行的指令。
-    每次都會執行這個指令，所以如果工具已經安裝好了，指令應該要不做任何事盡快結束。
-</div>
diff --git a/core/src/main/resources/hudson/tools/InstallSourceProperty/help.html b/core/src/main/resources/hudson/tools/InstallSourceProperty/help.html
index 25ecfe6d61..bd817db61d 100644
--- a/core/src/main/resources/hudson/tools/InstallSourceProperty/help.html
+++ b/core/src/main/resources/hudson/tools/InstallSourceProperty/help.html
@@ -10,5 +10,5 @@
     For a platform-independent tool (such as Ant), configuring multiple installers
     for a single tool makes not much sense, but for a platform dependent tool,
     multiple installer configurations allow you to run a different set up script
-    depending on the slave environment.
+    depending on the agent environment.
 </div>
diff --git a/core/src/main/resources/hudson/tools/InstallSourceProperty/help_de.html b/core/src/main/resources/hudson/tools/InstallSourceProperty/help_de.html
deleted file mode 100644
index 18f3f9c8fb..0000000000
--- a/core/src/main/resources/hudson/tools/InstallSourceProperty/help_de.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div>
-    Verwenden diese Option, wenn Jenkins bei Bedarf automatisch Hilfsprogramme
-    am angegebenen Ort installieren soll.
-
-    <p>
-    Wenn Sie diese Option anwählen, müssen Sie für jedes Hilfsprogramm eines
-    oder mehrere Installationsverfahren konfigurieren.
- 
-    <p>
-    Für ein plattformunabhängiges Hilfsprogramm (z.B. Apache Ant) ist es wenig
-    sinnvoll, mehrere Installationsverfahren anzugeben. Bei einem plattformabhängigen
-    Hilfsprogramm hingegen, können Sie so gezielt das Installationsverfahren der
-    jeweiligen Slave-Plattform anpassen.
-</div>
diff --git a/core/src/main/resources/hudson/tools/InstallSourceProperty/help_zh_TW.html b/core/src/main/resources/hudson/tools/InstallSourceProperty/help_zh_TW.html
deleted file mode 100644
index 40248d0da3..0000000000
--- a/core/src/main/resources/hudson/tools/InstallSourceProperty/help_zh_TW.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-    這個功能能讓 Jenkins 依您的需求，將工具安裝到您上面設定的地方去。
-
-    <p>
-    選用這個功能用，您需要設定一系列的工具「安裝程式」，每個安裝程式都定義 Jenkins 該如何安裝這項工具。
-
-    <p>
-    對不限定平台的工具 (例如 Ant) 設定多個「安裝程式」並不合理。
-    但是對平台相關的工具來說，多個安裝程式設定，讓您可以依 Slave 環境不同執行專屬的安裝 Script。
-</div>
diff --git a/core/src/main/resources/hudson/tools/Messages.properties b/core/src/main/resources/hudson/tools/Messages.properties
index e5d553866d..dabfa4c840 100644
--- a/core/src/main/resources/hudson/tools/Messages.properties
+++ b/core/src/main/resources/hudson/tools/Messages.properties
@@ -36,4 +36,4 @@ InstallSourceProperty.DescriptorImpl.displayName=Install automatically
 JDKInstaller.DescriptorImpl.displayName=Install from java.sun.com
 JDKInstaller.DescriptorImpl.doCheckId=Define JDK ID
 JDKInstaller.DescriptorImpl.doCheckAcceptLicense=You must agree to the license to download the JDK.
-ToolDescriptor.NotADirectory={0} is not a directory on the Jenkins master (but perhaps it exists on some slaves)
+ToolDescriptor.NotADirectory={0} is not a directory on the Jenkins master (but perhaps it exists on some agents)
diff --git a/core/src/main/resources/hudson/tools/Messages_bg.properties b/core/src/main/resources/hudson/tools/Messages_bg.properties
index 478d54594f..22c006f311 100644
--- a/core/src/main/resources/hudson/tools/Messages_bg.properties
+++ b/core/src/main/resources/hudson/tools/Messages_bg.properties
@@ -56,6 +56,4 @@ JDKInstaller.DescriptorImpl.doCheckId=\
  \u0423\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0430 \u043d\u0430 JDK (\u0440\u0430\u0437\u0432\u043e\u0439\u043d\u0438\u0442\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 \u0437\u0430 Java)
 JDKInstaller.DescriptorImpl.doCheckAcceptLicense=\
  \u0422\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u043f\u0440\u0438\u0435\u043c\u0435\u0442\u0435 \u043b\u0438\u0446\u0435\u043d\u0437\u0430, \u0437\u0430 \u0434\u0430 \u0441\u0432\u0430\u043b\u0438\u0442\u0435 JDK (\u0440\u0430\u0437\u0432\u043e\u0439\u043d\u0438\u0442\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 \u0437\u0430 Java).
-ToolDescriptor.NotADirectory=\
- \u201e{0}\u201c \u043d\u0435 \u0435 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u043d\u0438\u044f \u0441\u044a\u0440\u0432\u044a\u0440 \u043d\u0430 Jenkins (\u0432\u044a\u0437\u043c\u043e\u0436\u043d\u043e \u0435 \u0434\u0430 \u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430\
- \u043d\u0430 \u043d\u044f\u043a\u043e\u0438 \u043e\u0442 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u0442\u0435 \u043c\u0430\u0448\u0438\u043d\u0438)
+ 
diff --git a/core/src/main/resources/hudson/tools/Messages_ja.properties b/core/src/main/resources/hudson/tools/Messages_ja.properties
index ac2fff6e07..2e82dec80a 100644
--- a/core/src/main/resources/hudson/tools/Messages_ja.properties
+++ b/core/src/main/resources/hudson/tools/Messages_ja.properties
@@ -37,4 +37,3 @@ InstallSourceProperty.DescriptorImpl.displayName=\u81ea\u52d5\u30a4\u30f3\u30b9\
 JDKInstaller.DescriptorImpl.displayName=java.sun.com\u304b\u3089\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
 JDKInstaller.DescriptorImpl.doCheckId=JDK\u306eID\u3092\u5b9a\u7fa9\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 JDKInstaller.DescriptorImpl.doCheckAcceptLicense=JDK\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u306b\u306f\u4f7f\u7528\u8a31\u8afe\u306b\u540c\u610f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-ToolDescriptor.NotADirectory=\u30de\u30b9\u30bf\u30fc\u4e0a\u306e{0}\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093(\u30b9\u30ec\u30fc\u30d6\u306b\u306f\u3042\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093)\u3002
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tools/Messages_pt_BR.properties b/core/src/main/resources/hudson/tools/Messages_pt_BR.properties
index 91d0955134..b69eff530a 100644
--- a/core/src/main/resources/hudson/tools/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/tools/Messages_pt_BR.properties
@@ -52,5 +52,4 @@ CommandInstaller.no_toolHome=\u00c9 necess\u00e1rio fornecer um diret\u00f3rio h
 JDKInstaller.RequireOracleAccount=Instalar o JDK exige uma conta na Oracle. <a href="{0}" target="_new">Por favor informe seu usu\u00e1ro/senha</a>
 # Run Batch Command
 BatchCommandInstaller.DescriptorImpl.displayName=Executar comando em lotes
-# {0} is not a directory on the Jenkins master (but perhaps it exists on some slaves)
-ToolDescriptor.NotADirectory={0} n\u00e3o \u00e9 um diret\u00f3rio no Jenkins master (por\u00e9m pode existir em alguns slaves)
+
diff --git a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url.html b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url.html
index d6934a776f..9637265029 100644
--- a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url.html
+++ b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url.html
@@ -3,5 +3,5 @@
     Should be either a ZIP or a GZip-compressed TAR file.
     The timestamp on the server will be compared to the local version (if any)
     so you can publish updates easily.
-    The URL must be accessible from the Jenkins master but need not be accessible from slaves.
+    The URL must be accessible from the Jenkins master but need not be accessible from agents.
 </div>
diff --git a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url_de.html b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url_de.html
deleted file mode 100644
index 40c7f1ed63..0000000000
--- a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url_de.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-    URL, von der das Hilfsprogramm als binäres Archiv heruntergeladen werden kann.
-    Es werden ZIP- und GZIP-komprimierte TAR-Archive unterstützt.
-   
-    <p/>
-    Der Zeitstempel des Archivs auf dem Server wird mit der lokal installierten Version
-    (soweit vorhanden) verglichen, so daß Updates einfach veröffentlicht werden können.
- 
-    <p/>
-    Die URL muß vom Jenkins-Master aus erreichbar sein, nicht aber von jedem einzelnen
-    Slave-Knoten.
-</div>
diff --git a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url_zh_TW.html b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url_zh_TW.html
deleted file mode 100644
index 06a1b92db6..0000000000
--- a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url_zh_TW.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-    可以下載工具壓縮檔的 URL。
-    只支援 ZIP 或是 GZip 壓縮過的 TAR 檔。
-    伺服器上的檔案時間會跟本地版本 (如果有的話) 比較，所以您可以很輕鬆的發佈更新。
-    URL 要能從 Jenkins Master 連到，不過 Slave 連不到也沒關係。
-</div>
diff --git a/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message.jelly b/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message.jelly
deleted file mode 100644
index c91dfb8516..0000000000
--- a/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message.jelly
+++ /dev/null
@@ -1,13 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="warning">
-    <p>
-      ${%blurb}
-    </p>
-    <ul>
-      <j:forEach var="p" items="${it.offenders}">
-        <li>${p.longName}</li>
-      </j:forEach>
-    </ul>
-  </div>
-</j:jelly>
diff --git a/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message.properties b/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message.properties
deleted file mode 100644
index c1fc741c55..0000000000
--- a/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-blurb=This version of Jenkins comes with new versions of the following plugins that are currently \
-  <a href="https://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins">pinned</a> in \
-  the <a href="pluginManager/">plugin manager</a>. \
-  It is recommended to upgrade them to at least the version bundled with Jenkins.
diff --git a/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message_ja.properties b/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message_ja.properties
deleted file mode 100644
index b0eb2a9b60..0000000000
--- a/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message_ja.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2015, Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# This version of Jenkins comes with new versions of the following plugins that are currently \
-# <a href="https://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins">pinned</a> in \
-# the <a href="pluginManager/">plugin manager</a>. \
-# It is recommended to upgrade them to at least the version bundled with Jenkins.
-
-
-blurb=\u3053\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306eJenkins\u3067\u306f\u3001<a href="pluginManager/">\u30d7\u30e9\u30b0\u30a4\u30f3\u30de\u30cd\u30fc\u30b8\u30e3\u30fc</a>\u3067\
-<a href="https://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins">\u30d4\u30f3</a>\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u6b21\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u304c\
-\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u307e\u3059\u3002\
-\u30d4\u30f3\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u3001\u5c11\u306a\u304f\u3068\u3082Jenkins\u306b\u30d0\u30f3\u30c9\u30eb\u3055\u308c\u3066\u3044\u308b\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3059\u308b\u3053\u3068\u3092\u63a8\u5968\u3057\u307e\u3059\u3002
diff --git a/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message_pt_BR.properties b/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message_pt_BR.properties
deleted file mode 100644
index c2aeee6083..0000000000
--- a/core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message_pt_BR.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# This version of Jenkins comes with new versions of the following plugins that are currently \
-# <a href="https://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins">pinned</a> in \
-# the <a href="pluginManager/">plugin manager</a>. \
-# It is recommended to upgrade them to at least the version bundled with Jenkins.
-blurb=Essa vers\u00e3o do Jenkins vem com as vers\u00f5es novas dos seguintes plugins  \
-  <a href="https://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins">pinned</a> no \
-   <a href="pluginManager/">gerenciador de plugin</a>. \
-  \u00c9 recomendado atualizar para pelo menos a vers\u00e0o que vem junto com o Jenkins.
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
new file mode 100644
index 0000000000..b08aa93f7d
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
@@ -0,0 +1,45 @@
+<?jelly escape-by-default='true'?>
+<l:html norefresh="true" title="${app.instance.displayName}" xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <l:main-panel>
+    <form action="${app.instance.securityRealm.authenticationGatewayUrl}" method="POST">
+        <div class="plugin-setup-wizard bootstrap-3">
+          <div class="modal fade in" style="display: block;">
+            <div class="modal-dialog">
+              <div class="modal-content">
+                
+                <div class="modal-header">
+                  <h4 class="modal-title">${%Getting Started}</h4>
+                </div>
+                <div class="modal-body">
+                  <i class="water-mark icon-service"></i>
+                  <div class="jumbotron welcome-panel offline">
+                  
+                    <h1>${%Unlock Jenkins}</h1>
+                    <p>
+                        ${%jenkins.install.findSecurityTokenMessage(it.initialAdminPasswordFile)}
+                    </p>
+                    <p>${%Please copy the password from either location and paste it below.}</p>
+                    <j:if test="${error}">
+                        <div class="alert alert-danger">
+                          <strong>${%ERROR:} </strong>
+                          ${%The password entered is incorrect, please check the file for the correct password}
+                        </div>
+                    </j:if>
+                    <div class="form-group ${error ? 'has-error' : ''}">
+                    <label class="control-label" for="security-token">${%Administrator password}</label>
+                    <input name="j_username" value="${j.setupWizard.initialSetupAdminUserName}" type="hidden"/>
+                    <input id="security-token" class="form-control" type="password" name="j_password"/>
+                    </div>
+                    
+                  </div>
+                </div>
+                <div class="modal-footer">
+                  <input type="submit" class="btn btn-primary set-security-key" value="${%Continue}"/>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+    </form>
+  </l:main-panel>
+</l:html>
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.properties b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.properties
new file mode 100644
index 0000000000..a6f4bc4530
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.properties
@@ -0,0 +1,2 @@
+jenkins.install.findSecurityTokenMessage=To ensure Jenkins is securely set up by the administrator, \
+a password has been written to the log (<small><a href="https://jenkins.io/redirect/find-jenkins-logs" target="_blank">not sure where to find it?</a></small>) and this file on the server: <p><small><code>{0}</code></small></p>
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/index.jelly b/core/src/main/resources/jenkins/install/SetupWizard/index.jelly
new file mode 100644
index 0000000000..d001d433d5
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/SetupWizard/index.jelly
@@ -0,0 +1,8 @@
+<?jelly escape-by-default='true'?>
+<l:html norefresh="true" title="${it.displayName}" xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <l:main-panel>
+    <div class="plugin-setup-wizard-container"></div>
+    <script src="${resURL}/${j.installWizardPath}.js" type="text/javascript"/>
+    <link rel="stylesheet" href="${resURL}/${j.installWizardPath}.css" type="text/css" />
+  </l:main-panel>
+</l:html>
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/proxy-configuration.jelly b/core/src/main/resources/jenkins/install/SetupWizard/proxy-configuration.jelly
new file mode 100644
index 0000000000..7653509dca
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/SetupWizard/proxy-configuration.jelly
@@ -0,0 +1,13 @@
+<?jelly escape-by-default='true'?>
+<l:html norefresh="true" title="${it.displayName}" xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <l:main-panel>
+      <h1>${%HTTP Proxy Configuration}</h1>
+      <f:form method="post" action="/pluginManager/proxyConfigure" name="proxyConfigure">
+        <j:scope>
+          <j:set var="instance" value="${app.proxy}"/>
+          <j:set var="descriptor" value="${app.pluginManager.proxyDescriptor}"/>
+          <st:include from="${descriptor}" page="${descriptor.configPage}" />
+        </j:scope>
+      </f:form>
+  </l:main-panel>
+</l:html>
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly
new file mode 100644
index 0000000000..34357c9b0a
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly
@@ -0,0 +1,53 @@
+<!--
+  This is used to create the first user.
+-->
+<?jelly escape-by-default='true'?>
+<l:html norefresh="true" title="${it.displayName}" xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <l:main-panel>
+    <style type="text/css">
+      @import url(https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css);
+      @import url(https://fonts.googleapis.com/css?family=Roboto:400,300,500,900,700);
+      
+      #main-panel {
+          margin: 0;
+          padding: 0;
+      }
+      tr td {
+          padding-bottom: 2px;
+      }
+      body {
+          padding: 20px 20px 20px 100px;
+          font-family: 'roboto';
+      }
+      form > div {
+          margin: 0 !important;
+      }
+      h1 {
+          font-family: 'roboto', sans-serif;
+          font-size: 48px;
+          margin-top: 30px;
+          font-weight: 500;
+      }
+      h1 img {
+          position: absolute;
+          right: -80px;
+          top: 38px;
+      }
+      tr td, input {
+          line-height: 25px;
+          margin-bottom: 6px;
+      }
+      input[type=text], input[type=password] {
+          border: 1px solid #ddd;
+          border-radius: 2px;
+          padding: 1px 8px;
+      }
+    </style>
+    <form action="${rootURL}/setupWizard/createAdminUser" method="post">
+      <local:_entryForm it="${app.securityRealm}" host="${app.securityRealm}" title="${%Create First Admin User}" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
+      <script>
+        $('username').focus();
+      </script>
+    </form>
+  </l:main-panel>
+</l:html>
diff --git a/core/src/main/resources/jenkins/install/UpgradeWizard/footer.jelly b/core/src/main/resources/jenkins/install/UpgradeWizard/footer.jelly
new file mode 100644
index 0000000000..151eb2058e
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/UpgradeWizard/footer.jelly
@@ -0,0 +1,74 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+  <j:if test="${it.due}">
+    <style>
+      #upgrade-fragment {
+        background: url(${rootURL}/images/jenkins.png) no-repeat 5% -63px;
+        padding: 10px;
+        box-shadow: 0 1px rgba(0,0,0,.1), 0 2px 5px rgba(0,0,0,.2), inset 0 -50px 50px -50px #cef;
+        position: relative;
+      }
+
+      #upgrade-notice {
+        text-align: center;
+        font-size: 20px;
+        height: 60px;
+        vertical-align:middle;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      #upgrade-notice > .post{
+        display:inline-block;
+        color:#fff;
+        background: #478;
+        border:1px solid #356;
+        text-decoration:none;
+        padding:.5em;
+        margin:0 .33em 0 .5em;
+        border-radius:3px;
+      }
+      #upgrade-notice > .post:hover{
+        background: #356;
+      }
+      #upgrade-snooze {
+        position:absolute;
+        text-decoration:none;
+        font-weight:bold;
+        width:2.5em;
+        line-height:1.33em;
+        text-align:center;
+        top: -2px;
+        right: 25px;
+        background-color: #d24939;
+        color: #eeeeee;
+        border: 1px solid #be3a2b;
+        border-bottom-left-radius:3px;
+        border-bottom-right-radius:3px;
+      }
+      #upgrade-snooze:hover{
+        background:#900;
+        color:#fff;
+      }
+    </style>
+    <div style="display:none">
+      <div id="upgrade-fragment">
+        <a id="upgrade-snooze" class="post" href="${rootURL}/${it.url}/snooze">
+          x
+        </a>
+        <div id="upgrade-notice">
+          <j:whitespace>${%msg.before}</j:whitespace> 
+          <f:link href="${rootURL}/${it.url}/upgrade" post="true">${%msg.link}</f:link>
+          <j:whitespace>${%msg.after}</j:whitespace>
+        </div>
+      </div>
+    </div>
+    <script>
+      (function() {
+        var e = $('upgrade-fragment');
+        e.remove();
+        $('page-body').insert({ top: e });
+      })();
+    </script>
+  </j:if>
+</j:jelly>
diff --git a/core/src/main/resources/jenkins/install/UpgradeWizard/footer.properties b/core/src/main/resources/jenkins/install/UpgradeWizard/footer.properties
new file mode 100644
index 0000000000..2d977c9e7a
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/UpgradeWizard/footer.properties
@@ -0,0 +1,3 @@
+msg.before=Welcome to Jenkins 2!\u0020
+msg.link=Install new features
+msg.after=\u0020to complete the upgrade
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
new file mode 100644
index 0000000000..63893f3e2d
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
@@ -0,0 +1,52 @@
+installWizard_welcomePanel_title=Getting Started
+installWizard_welcomePanel_banner=Customize Jenkins
+installWizard_welcomePanel_message=Plugins extend Jenkins with additional features to support many different needs.
+installWizard_welcomePanel_recommendedActionTitle=Install suggested plugins
+installWizard_welcomePanel_recommendedActionDetails=Install plugins the Jenkins community finds most useful.
+installWizard_welcomePanel_customizeActionTitle=Select plugins to install
+installWizard_welcomePanel_customizeActionDetails=Select and install plugins most suitable for your needs.
+installWizard_offline_title=Offline
+installWizard_offline_message=This Jenkins instance appears to be offline. \
+<p style="font-size:18px; margin-top: 6%"> \
+For information about installing Jenkins without an internet connection, see the \
+<a href="https://wiki.jenkins-ci.org/display/JENKINS/Offline+Jenkins+Installation" target="_blank">Offline Jenkins Installation Documentation</a>. <br/><br/> \
+You may choose to continue by configuring a proxy or skipping plugin installation. \
+</p>
+installWizard_error_header=An error occurred
+installWizard_error_message=An error occurred during installation:
+installWizard_error_connection=Unable to connect to Jenkins
+installWizard_installCustom_title=Getting Started
+installWizard_installCustom_selectAll=All
+installWizard_installCustom_selectNone=None
+installWizard_installCustom_selectRecommended=Recommended
+installWizard_installCustom_selected=Selected
+installWizard_installCustom_dependenciesPrefix=Dependencies
+installWizard_installCustom_pluginListDesc=Note that the full list of plugins is not shown here. Additional plugins can be installed in the <strong>Plugin Manager</strong> once the initial setup is complete. <a href="https://wiki.jenkins-ci.org/display/JENKINS/Installing+Jenkins#InstallingJenkins-InstallationWizard" target="_blank">See the Wiki for more information</a>.
+installWizard_goBack=Back
+installWizard_goInstall=Install
+installWizard_installing_title=Getting Started
+installWizard_installing_detailsLink=Details...
+installWizard_installComplete_title=Getting Started
+installWizard_installComplete_banner=Jenkins is ready!
+installWizard_pluginsInstalled_message=Your plugin installations are complete.
+installWizard_installComplete_message=Your Jenkins setup is complete.
+installWizard_installComplete_finishButtonLabel=Start using Jenkins
+installWizard_installComplete_restartRequiredMessage=Some plugins require Jenkins to be restarted.
+installWizard_installComplete_restartLabel=Restart
+installWizard_installIncomplete_title=Resume Installation
+installWizard_installIncomplete_banner=Resume Installation
+installWizard_installIncomplete_message=Jenkins was restarted during installation and some plugins didn't seem to get installed.
+installWizard_installIncomplete_resumeInstallationButtonLabel=Resume
+installWizard_saveFirstUser=Save and Finish
+installWizard_skipFirstUser=Continue as admin
+installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
+You've skipped creating an admin user. To log in, use the username: 'admin' and \
+the administrator password you used to access the setup wizard.\
+</div>
+installWizard_addFirstUser_title=Getting Started
+installWizard_configureProxy_label=Configure Proxy
+installWizard_configureProxy_save=Save and Continue
+installWizard_skipPluginInstallations=Skip Plugin Installations
+installWizard_installIncomplete_dependenciesLabel=Dependencies
+installWizard_installingConsole_dependencyIndicatorNote=** - required dependency
+installWizard_retry=Retry
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_de.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_de.properties
new file mode 100644
index 0000000000..0495cd6d44
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_de.properties
@@ -0,0 +1 @@
+installWizard_welcomePanel_banner=Willkommen zu Jenkins
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_es.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_es.properties
new file mode 100644
index 0000000000..d856117ab4
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_es.properties
@@ -0,0 +1 @@
+installWizard_welcomePanel_banner=Bienvenido a Jenkins
diff --git a/core/src/main/resources/jenkins/management/Messages.properties b/core/src/main/resources/jenkins/management/Messages.properties
index 6789348339..ff1761da0f 100644
--- a/core/src/main/resources/jenkins/management/Messages.properties
+++ b/core/src/main/resources/jenkins/management/Messages.properties
@@ -25,6 +25,9 @@
 ConfigureLink.DisplayName=Configure System
 ConfigureLink.Description=Configure global settings and paths.
 
+ConfigureTools.DisplayName=Global Tool Configuration
+ConfigureTools.Description=Configure tools, their locations and automatic installers.
+
 ReloadLink.DisplayName=Reload Configuration from Disk
 ReloadLink.Description=Discard all the loaded data in memory and reload everything from file system.\n\
                        Useful when you modified config files directly on disk.
diff --git a/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help.html b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help.html
index 7a50890f34..15ee4f5f33 100644
--- a/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help.html
+++ b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help.html
@@ -1,19 +1,51 @@
 <div>
-  This controls the disk consumption of Jenkins by managing how long you'd like to keep
-  records of the builds (such as console output, build artifacts, and so on.)
-  Jenkins offers two criteria:
-
+  This determines when, if ever, build records for this project should be
+  discarded. Build records include the console output, archived artifacts, and
+  any other metadata related to a particular build.
+  <p>
+  Keeping fewer builds means less disk space will be used in the <i>Build Record
+  Root Directory</i>, which is specified on the <i>Configure System</i> screen.
+  <p>
+  <!-- TODO: Most/all of the following should be dynamic, showing info from the
+       `BuildDiscarder` implementations that are currently loaded -->
+  Jenkins offers two options for determining when builds should be discarded:
   <ol>
     <li>
-      Driven by age. You can have Jenkins delete a record if it reaches a certain age
-      (for example, 7 days old.)
+      Build age: discard builds if they reach a certain age; for example, seven
+      days old.
     <li>
-      Driven by number. You can have Jenkins make sure that it only maintains up to
-      N build records. If a new build is started, the oldest record will
-      be simply removed.
+      Build count: discard the oldest build if a certain number of builds
+      already exist.
   </ol>
+  These two options can be active at the same time, so you can keep builds for
+  14 days, but only up to a limit of 50 builds, for example.  If either limit is
+  exceeded, then any builds beyond that limit will be discarded.
+  <p>
+  You can also ensure that important builds are kept forever, regardless of the
+  setting here &mdash; click the <i>Keep this build forever</i> button on the
+  build page.
+  <br>
+  The last stable and last successful build are also excluded from these rules.
 
-  Jenkins also allows you to mark an individual build as 'Keep this log forever', to
-  exclude certain important builds from being discarded automatically.
-  The last stable and last successful build are always kept as well.
-</div>
\ No newline at end of file
+  <hr>
+
+  In the <i>Advanced</i> section, the same options can be specified, but
+  specifically for build <b>artifacts</b>.  If enabled, build artifacts will be
+  discarded for any builds which exceed the defined limits.  The builds
+  themselves will still be kept; only the associated artifacts, if any, will be
+  deleted.
+  <p>
+  For example, if a project builds some software and produces a large installer,
+  which is archived, you may wish to always keep the console log and information
+  about which source control commit was built, while for disk space reasons, you
+  may want to keep only the last three installers that were built.
+  <br>
+  This can make sense for projects where you can easily recreate the same
+  artifacts later by building the same source control commit again.
+
+  <hr>
+
+  Note that Jenkins does not discard items immediately when this configuration
+  is updated, or as soon as any of the configured values are exceeded; these
+  rules are evaluated each time that a build of this project completes.
+</div>
diff --git a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties
index c8040aad7a..b1c4d4d8e1 100644
--- a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties
+++ b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties
@@ -8,7 +8,7 @@ EXECUTOR_NUMBER.blurb=\
   (among executors of the same machine) that\u2019s \
   carrying out this build. This is the number you see in \
   the "build executor status", except that the number starts from 0, not 1.
-NODE_NAME.blurb=Name of the slave if the build is on a slave, or "master" if run on master
+NODE_NAME.blurb=Name of the agent if the build is on an agent, or "master" if run on master
 NODE_LABELS.blurb=Whitespace-separated list of labels that the node is assigned.
 WORKSPACE.blurb=The absolute path of the directory assigned to the build as a workspace.
 JENKINS_HOME.blurb=The absolute path of the directory assigned on the master node for Jenkins to store data.
diff --git a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_de.properties b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_de.properties
index bbd98cb35a..bb29c41ad9 100644
--- a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_de.properties
+++ b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_de.properties
@@ -10,7 +10,6 @@ EXECUTOR_NUMBER.blurb=Die laufende Nummer des Build-Prozessors, der den aktuelle
                               Dies ist die Nummer, die Sie auch im Build-Prozessor Status sehen - \
                               mit der Ausnahme, da\u00DF bei der Umgebungsvariable die Z\u00E4hlung bei 0 und nicht \
                               bei 1 beginnt.
-NODE_NAME.blurb=Name des Build-Slaves, wenn auf einem Build-Slave gebaut wird, oder "master" wenn auf dem Master-Server gebaut wird.
 NODE_LABELS.blurb=Durch Leerzeichen getrennte Liste von Labels, die dem Knoten zugeordnet sind.
 WORKSPACE.blurb=Der absolute Pfad zum Arbeitsbereich.
 JENKINS_HOME.blurb=Der absolute Pfad des Verzeichnisses, in dem der Master-Server seine Daten speichert.
diff --git a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_fr.properties b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_fr.properties
index 7026f87f9d..a0d15385dd 100644
--- a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_fr.properties
+++ b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_fr.properties
@@ -7,7 +7,6 @@ EXECUTOR_NUMBER.blurb=Le num\u00E9ro unique qui identifie l'ex\u00E9cuteur coura
                               (parmi les ex\u00E9cuteurs d'une m\u00EAme machine) qui a contruit ce build. \
                               Il s'agit du num\u00E9ro que vous voyez dans le "statut de l'ex\u00E9cuteur du build", \
                               sauf que la num\u00E9rotation commence \u00E0 0 et non \u00E0 1.
-NODE_NAME.blurb=
 NODE_LABELS.blurb=
 WORKSPACE.blurb=Le chemin absolu vers le r\u00E9pertoire de travail.
 JENKINS_HOME.blurb=
diff --git a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_ja.properties b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_ja.properties
index d66e0424df..49d12ea405 100644
--- a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_ja.properties
+++ b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_ja.properties
@@ -5,7 +5,6 @@ BUILD_TAG.blurb=\u6587\u5B57\u5217 "jenkins-<i>$'{'JOB_NAME}</i>-<i>$'{'BUILD_NU
                 	    \u7C21\u6613\u306A\u8B58\u5225\u5B50\u3068\u3057\u3066\u3001\u30EA\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u3084jar\u30D5\u30A1\u30A4\u30EB\u306A\u3069\u306B\u4ED8\u4E0E\u3059\u308B\u306E\u306B\u4FBF\u5229\u3067\u3059\u3002
 EXECUTOR_NUMBER.blurb=\u3053\u306E\u30D3\u30EB\u30C9\u3092\u5B9F\u884C\u3057\u3066\u3044\u308B\u73FE\u5728\u306E\u30A8\u30B0\u30BC\u30AD\u30E5\u30FC\u30BF\u30FC\u3092\u8B58\u5225\u3059\u308B(\u540C\u4E00\u30DE\u30B7\u30F3\u306E\u4E2D\u3067)\u30E6\u30CB\u30FC\u30AF\u306A\u756A\u53F7\u3002\
                                   "\u30D3\u30EB\u30C9\u5B9F\u884C\u72B6\u614B"\u306B\u8868\u793A\u3055\u308C\u3066\u3044\u308B\u6570\u5B57\u3067\u3059\u304C\u30011\u3067\u306F\u306A\u304F0\u304B\u3089\u59CB\u307E\u308B\u6570\u5B57\u3067\u3059\u3002
-NODE_NAME.blurb=\u30D3\u30EB\u30C9\u304C\u5B9F\u884C\u3055\u308C\u308B\u30B9\u30EC\u30FC\u30D6\u306E\u540D\u79F0\u3002\u30DE\u30B9\u30BF\u30FC\u3067\u5B9F\u884C\u3055\u308C\u308B\u5834\u5408\u306F"master"\u3002
 NODE_LABELS.blurb=\u30CE\u30FC\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30E9\u30D9\u30EB\u306E\u30EA\u30B9\u30C8\uFF08\u30B9\u30DA\u30FC\u30B9\u533A\u5207\u308A)\u3002
 WORKSPACE.blurb=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306E\u7D76\u5BFE\u30D1\u30B9\u3002
 JENKINS_HOME.blurb=
diff --git a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_nl.properties b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_nl.properties
index cd999280d1..b127be505e 100644
--- a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_nl.properties
+++ b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_nl.properties
@@ -7,7 +7,6 @@ EXECUTOR_NUMBER.blurb=Het unieke nummer, waarmee uw huidige uitvoerder ge\u00EFd
                               Dit is het nummer dat u terugvindt in de "Status uitvoerders"-tabel op de hoofdpagina. \
                               Merk wel dat in die tabel geteld wordt vanaf 1. Uitvoerder 1 in de "Status uitvoerders"-tabel \
                               komt dus overeen met een "EXECUTOR_NUMBER" gelijk aan 0.
-NODE_NAME.blurb=
 NODE_LABELS.blurb=
 WORKSPACE.blurb=Het absolute pad naar de werkplaats.
 JENKINS_HOME.blurb=
diff --git a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_tr.properties b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_tr.properties
index b0a753fdc1..b3438af07b 100644
--- a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_tr.properties
+++ b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_tr.properties
@@ -3,7 +3,6 @@ BUILD_ID.blurb=
 JOB_NAME.blurb=
 BUILD_TAG.blurb=
 EXECUTOR_NUMBER.blurb=
-NODE_NAME.blurb=
 NODE_LABELS.blurb=
 WORKSPACE.blurb=
 JENKINS_HOME.blurb=
diff --git a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_zh_TW.properties b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_zh_TW.properties
index 3c9e7ba68a..346c969498 100644
--- a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_zh_TW.properties
+++ b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_zh_TW.properties
@@ -28,7 +28,6 @@ BUILD_TAG.blurb="jenkins-<i>$'{'JOB_NAME}</i>-<i>$'{'BUILD_NUMBER}</i>" \u5b57\u
 EXECUTOR_NUMBER.blurb=\
   \u57f7\u884c\u672c\u6b21\u5efa\u7f6e\u7684\u57f7\u884c\u7a0b\u5f0f\u7de8\u865f\uff0c\u53ef\u7528\u4f86\u9451\u5225\u540c\u6a5f\u5668\u4e0a\u7684\u4e0d\u540c\u57f7\u884c\u7a0b\u5f0f\u3002\
   \u4e5f\u5c31\u662f\u60a8\u5728\u300c\u5efa\u7f6e\u57f7\u884c\u7a0b\u5f0f\u72c0\u614b\u300d\u88e1\u770b\u5230\u7684\u865f\u78bc\uff0c\u53ea\u662f\u9019\u88e1\u5f9e 0 \u958b\u59cb\u7b97\uff0c\u4e0d\u662f 1\u3002
-NODE_NAME.blurb=\u5982\u679c\u5efa\u7f6e\u662f\u5728 Slave \u7bc0\u9ede\u4e0a\u57f7\u884c\uff0c\u5c31\u662f\u7bc0\u9ede\u7684\u540d\u7a31; \u5982\u679c\u5728 Master \u4e0a\u8dd1\u5c31\u986f\u793a "master"
 NODE_LABELS.blurb=\u4ee5\u7a7a\u767d\u5206\u9694\u7684\u7bc0\u9ede\u6a19\u7c64\u6e05\u55ae\u3002
 WORKSPACE.blurb=\u5efa\u7f6e\u5de5\u4f5c\u5340\u76ee\u9304\u7684\u7d55\u5c0d\u8def\u5f91\u3002
 JENKINS_HOME.blurb=Master \u7bc0\u9ede\u8cc7\u6599\u5b58\u653e\u76ee\u9304\u7684\u7d55\u5c0d\u8def\u5f91\u3002
diff --git a/core/src/main/resources/jenkins/model/GlobalQuietPeriodConfiguration/help-quietPeriod.html b/core/src/main/resources/jenkins/model/GlobalQuietPeriodConfiguration/help-quietPeriod.html
index fb8b2665a6..4beaab60a7 100644
--- a/core/src/main/resources/jenkins/model/GlobalQuietPeriodConfiguration/help-quietPeriod.html
+++ b/core/src/main/resources/jenkins/model/GlobalQuietPeriodConfiguration/help-quietPeriod.html
@@ -1,21 +1,23 @@
 <div>
-  If set, a newly scheduled build waits for this many seconds before actually being built.
-  This is useful for:
-  <ul>
-    <li>
-      Collapsing multiple CVS change notification e-mails into one (some CVS changelog
-      e-mail generation scripts generate multiple e-mails in quick succession when
-      a commit spans across directories).
-    </li>
-    <li>
-      If your coding style is such that you commit one logical change in a few cvs/svn
-      operations, then setting a longer quiet period would prevent Jenkins from building
-      it prematurely and reporting a failure.
-    </li>
-    <li>
-      Throttling builds. If your Jenkins installation is too busy with too many builds,
-      setting a longer quiet period can reduce the number of builds.
-    </li>
-  </ul>
-  If not explicitly set at project-level, the system-wide default value is used.
-</div>
\ No newline at end of file
+  When this option is checked, newly triggered builds of this project will be
+  added to the queue, but Jenkins will wait for the specified period of time
+  before actually starting the build.
+  <p>
+  For example, if your builds take a long time to execute, you may want to
+  prevent multiple source control commits that are made at approximately the
+  same time from triggering multiple builds.  Enabling the quiet period would
+  prevent a build from being started as soon as Jenkins discovers the first
+  commit; this would give the developer the chance to push more commits which
+  would be included in the build when it starts.  This reduces the size of the
+  queue, meaning that developers would get feedback faster for their series of
+  commits, and the load on the Jenkins system would be reduced.
+  <p>
+  If a new build of this project is triggered while a build is already sitting
+  in the queue, waiting for its quiet period to end, the quiet period will not
+  be reset.  The newly triggered build will not be added to the queue, unless
+  this project is parameterised and the build has different parameters to the
+  build already in the queue.
+  <p>
+  If this option is not checked, then the system-wide default value from the
+  <i>Configure System</i> screen will be used.
+  </div>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/configureExecutors.jelly b/core/src/main/resources/jenkins/model/Jenkins/configureExecutors.jelly
index 921dc65e3e..751bea6574 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/configureExecutors.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/configureExecutors.jelly
@@ -36,12 +36,12 @@ THE SOFTWARE.
       This page has moved
     </h1>
     <p>
-      Starting 1.271, slave configuration is split into individual configuration page per slave,
+      Starting 1.271, agent configuration is split into individual configuration page per agent,
       accessible from <a href="computer/">here</a>.
     </p>
     <ul>
-      <li>To configure existing slaves, click the above link, click their name, and then click the config link from the left</li>
-      <li>To add a new slave, click the above link, and click "add new slave"</li>
+      <li>To configure existing agents, click the above link, click their name, and then click the config link from the left</li>
+      <li>To add a new agent, click the above link, and click "add new agent"</li>
     </ul>
   </l:main-panel>
 </l:layout>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html b/core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html
index 2d7c1159f5..ebe0002239 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html
+++ b/core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html
@@ -1,15 +1,28 @@
 <div>
-    Specify where Jenkins would store records of the past builds.
-    This value can include the following variables.
-
-    <ul>
-        <li><tt>${JENKINS_HOME}</tt> &mdash; Jenkins home directory.
-        <li><tt>${ITEM_ROOTDIR}</tt> &mdash; Root directory of a job for which the default workspace is allocated.
-        <li><tt>${ITEM_FULL_NAME}</tt> &mdash; '/'-separated job name, like "foo/bar".
-    </ul>
-
+    Specifies where Jenkins will store build records on the file system. This
+    includes the console output and other metadata generated by a build.
     <p>
-    Changing this value allows you to put build records on a bigger but slow disk,
-    while keeping JENKINS_HOME on highly available backed up drive, for example.
-    Default value is <tt>${ITEM_ROOTDIR}/builds</tt>.
-</div>
\ No newline at end of file
+    This value may include the following variables:
+    <ul>
+        <li><tt>${JENKINS_HOME}</tt> &mdash; Absolute path of the Jenkins home
+            directory
+        <li><tt>${ITEM_ROOTDIR}</tt> &mdash; Absolute path of the directory
+            where Jenkins stores the configuration and related metadata for a
+            given job
+        <li><tt>${ITEM_FULL_NAME}</tt> &mdash; The full name of a given job,
+            which may be slash-separated, e.g. <tt>foo/bar</tt> for the job
+            <tt>bar</tt> in folder <tt>foo</tt>
+    </ul>
+    The value must include <tt>${ITEM_ROOTDIR}</tt> or
+    <tt>${ITEM_FULL_NAME}</tt>, so that each job can store its build records
+    separately.
+    <p>
+    Changing this value allows you to store build records on a larger, but
+    slower disk, rather than on the same disk where builds are executed.
+    <p>
+    Any changes to this value will take effect as soon as this configuration
+    page is saved, but note that Jenkins will not automatically migrate any data
+    from the current build record root directory.
+    <p>
+    The default value is <tt>${ITEM_ROOTDIR}/builds</tt>.
+</div>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html b/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html
index 7906d5c190..765f7464e0 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html
+++ b/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html
@@ -1,15 +1,30 @@
 <div>
-    Specify where Jenkins would store job workspaces on the master node.
-    (It has no effect on builds run on slaves.)
-    This value can include the following variables.
-
-    <ul>
-        <li><tt>${JENKINS_HOME}</tt> &mdash; Jenkins home directory.
-        <li><tt>${ITEM_ROOTDIR}</tt> &mdash; Root directory of a job for which the default workspace is allocated.
-        <li><tt>${ITEM_FULL_NAME}</tt> &mdash; '/'-separated job name, like "foo/bar".
-    </ul>
-
+    Specifies where Jenkins will store workspaces for builds that are executed
+    on the master.<br>
+    It has no effect on builds that are executed on agents.
     <p>
-    Changing this value allows you to put workspaces on SSD, SCSI, or even ram disks.
-    Default value is <tt>${ITEM_ROOTDIR}/workspace</tt>.
-</div>
\ No newline at end of file
+    This value may include the following variables:
+    <ul>
+        <li><tt>${JENKINS_HOME}</tt> &mdash; Absolute path of the Jenkins home
+            directory
+        <li><tt>${ITEM_ROOTDIR}</tt> &mdash; Absolute path of the directory
+            where Jenkins stores the configuration and related metadata for a
+            given job
+        <li><tt>${ITEM_FULL_NAME}</tt> &mdash; The full name of a given job,
+            which may be slash-separated, e.g. <tt>foo/bar</tt> for the job
+            <tt>bar</tt> in folder <tt>foo</tt>
+    </ul>
+    The value should normally include <tt>${ITEM_ROOTDIR}</tt> or
+    <tt>${ITEM_FULL_NAME}</tt>, otherwise different jobs will end up sharing the
+    same workspace.
+    <p>
+    As builds tend to be disk I/O intensive, changing this value enables you to
+    put build workspaces on faster storage hardware, such as SSDs or even RAM
+    disks.
+    <p>
+    Any changes to this value will take effect as soon as this configuration
+    page is saved, but note that Jenkins will not automatically migrate any data
+    from the current workspace root directory.
+    <p>
+    The default value is <tt>${ITEM_ROOTDIR}/workspace</tt>.
+</div>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir_zh_TW.html b/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir_zh_TW.html
deleted file mode 100644
index e849c6f5c0..0000000000
--- a/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir_zh_TW.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-    設定 Jenkins 在 Master 節點上存放作業工作區的地方 (對 Slave 節點上的建置無效)，可以使用下列變數:
-
-    <ul>
-        <li><code>${JENKINS_HOME}</code> &mdash; Jenkins 主目錄。
-        <li><code>${ITEM_ROOTDIR}</code> &mdash; 作業根目錄，也就是放預設工作區的地方。
-        <li><code>${ITEM_FULL_NAME}</code> &mdash; 用 '/' 隔開的作業名稱，例如 "foo/bar"。
-    </ul>
-
-    <p>
-    讓您可以把工作區放到 SSD, SCSI 甚至是 Ram Disk 上。
-    預設值是 <code>${ITEM_ROOTDIR}/workspace</code>。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/model/Jenkins/login.jelly b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
index f7e02a5f50..29d9192eda 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/login.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
@@ -24,6 +24,11 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <j:choose>
+  <j:when test="${it.setupWizard != null and it.setupWizard.useGeneratedPassword()}">
+    <st:include it="${it.setupWizard}" page="authenticate-security-token"/>
+  </j:when>
+  <j:otherwise>
   <l:layout norefresh="true">
     <l:hasPermission permission="${app.READ}">
       <st:include page="sidepanel.jelly" />
@@ -70,4 +75,6 @@ THE SOFTWARE.
       </div>
     </l:main-panel>
   </l:layout>
+  </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/loginError.jelly b/core/src/main/resources/jenkins/model/Jenkins/loginError.jelly
index 6f7c2bfb22..d17d3eaff6 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/loginError.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/loginError.jelly
@@ -27,6 +27,10 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:choose>
     <j:new var="h" className="hudson.Functions" />
+    <j:when test="${app.setupWizard != null and app.setupWizard.useGeneratedPassword()}">
+      <j:set var="error" value="true"/>
+      <st:include it="${app.setupWizard}" page="authenticate-security-token"/>
+    </j:when>
     <j:when test="${app.isUseSecurity() and h.isAnonymous()}">
       <!--
         The only time the error message makes sense is when Jenkins is protected and the user failed to authenticate.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.properties
index b1438e6fbb..1cc37cc3bd 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.properties
@@ -1 +1 @@
-threadDump_blurb=Visit <a href="{0}">this page</a> for master and slave thread dumps.
+threadDump_blurb=Visit <a href="{0}">this page</a> for master and agent thread dumps.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_de.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_de.properties
index 3797962b79..8a60d7efc0 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_de.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_de.properties
@@ -28,4 +28,3 @@ Pinned=Gesperrt
 Name=Name
 Plugins=Plugins
 Version=Version
-threadDump_blurb=Besuchen Sie <a href="{0}">diese Seite</a>, um die Master und Slave Thread Dumps zu sehen.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_ja.properties
index 170abca067..49b8a4f79a 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_ja.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_ja.properties
@@ -30,4 +30,3 @@ Version=\u30d0\u30fc\u30b8\u30e7\u30f3
 Enabled=\u6709\u52b9\u5316
 Pinned=\u30d4\u30f3
 Thread\ Dumps=\u30b9\u30ec\u30c3\u30c9\u30c0\u30f3\u30d7
-threadDump_blurb=\u30de\u30b9\u30bf\u30fc\u3068\u30b9\u30ec\u30fc\u30d6\u306e\u30b9\u30ec\u30c3\u30c9\u30c0\u30f3\u30d7\u306f<a href="{0}">\u3053\u3061\u3089</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties
index 16e6abedf9..0e7bcd0313 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties
@@ -30,5 +30,4 @@ Version=Vers\u00E3o
 Thread\ Dumps=Thread Dumps
 No\ plugins\ installed.=Nenhum plugin instalado.
 System\ Information=Informa\u00e7\u00f5es do sistema
-# Visit <a href="{0}">this page</a> for master and slave thread dumps.
-threadDump_blurb=Visite <a href="{0}">esta p\u00e1gina</a> para thread dumps do master e slaves.
+
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_zh_TW.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_zh_TW.properties
index c28c78dc3e..85b258fb53 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_zh_TW.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_zh_TW.properties
@@ -32,4 +32,3 @@ Version=\u7248\u672c
 Pinned=\u5df2\u639b\u8f09
 
 Thread\ Dumps=\u57f7\u884c\u7dd2\u50be\u5370
-threadDump_blurb=\u5230<a href="{0}">\u9019\u4e00\u9801</a>\u53ef\u4ee5\u770b\u5230 Master \u53ca Slave \u7684\u57f7\u884c\u7dd2\u50be\u5370\u5167\u5bb9\u3002
diff --git a/core/src/main/resources/jenkins/model/Messages.properties b/core/src/main/resources/jenkins/model/Messages.properties
index 63ffa92e53..297812254b 100644
--- a/core/src/main/resources/jenkins/model/Messages.properties
+++ b/core/src/main/resources/jenkins/model/Messages.properties
@@ -70,4 +70,4 @@ ParameterizedJobMixIn.build_with_parameters=Build with Parameters
 ParameterizedJobMixIn.build_now=Build Now
 BlockedBecauseOfBuildInProgress.shortDescription=Build #{0} is already in progress{1}
 BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
-BuildDiscarderProperty.displayName=Discard Old Builds
+BuildDiscarderProperty.displayName=Discard old builds
diff --git a/core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties b/core/src/main/resources/jenkins/model/item_category/Messages.properties
similarity index 64%
rename from core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties
rename to core/src/main/resources/jenkins/model/item_category/Messages.properties
index 76ece934fa..b0aac4f438 100644
--- a/core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties
+++ b/core/src/main/resources/jenkins/model/item_category/Messages.properties
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio
+# Copyright (c) 2016, CloudBees, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,4 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=A execu\u00e7\u00e3o aconteceu no agente JVM slave.
+Uncategorized.DisplayName=Uncategorized
+Uncategorized.Description=Item types that have not yet been categorized by their plugin maintainer.
+StandaloneProjects.DisplayName=Standalone Projects
+StandaloneProjects.Description=Create projects with a self-contained configuration and history. These projects can be at the top-level or grouped within folders.
+NestedProjects.DisplayName=Nested Projects
+NestedProjects.Description=Create project categories or project hierarchies with folders. Folders can be created manually or automatically based on repositories.
diff --git a/core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.properties b/core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.properties
index 95377db314..7b49ac2619 100644
--- a/core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.properties
+++ b/core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.properties
@@ -1,2 +1,2 @@
-blurb=Jenkins has rejected some commands from slaves, because we are unsure if it is open for slaves to execute, \
+blurb=Jenkins has rejected some commands from agents, because we are unsure if it is open for agents to execute, \
   but this rejection has probably broken some builds. You should examine the situation to see if they should be whitelisted.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message_pt_BR.properties b/core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message_pt_BR.properties
index dd8765f735..25a215256f 100644
--- a/core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message_pt_BR.properties
+++ b/core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message_pt_BR.properties
@@ -20,9 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Jenkins has rejected some commands from slaves, because we are unsure if it is open for slaves to execute, \
-# but this rejection has probably broken some builds. You should examine the situation to see if they should be whitelisted.
-blurb=Jenkins rejeitou alguns comandos dos  slaves, porque n�o tem certeza se est� dispon�vel para chamar os slaves, \
-  e essa rejei��o provavelmente quebrou alguns builds. Voc� deve examinar a situa��o e avaliar se est� Ok.
 Examine=
 Dismiss=
diff --git a/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly b/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly
index 62dbc88621..d4c181f80f 100644
--- a/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly
+++ b/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly
@@ -26,14 +26,14 @@ THE SOFTWARE.
 <l:layout title="${%Whitelist}" permission="${app.RUN_SCRIPTS}">
   <st:include page="sidepanel.jelly" it="${app}"/>
   <l:main-panel>
-    <h1>${%Slave &#8594; Master Access Control}</h1>
+    <h1>${%Agent &#8594; Master Access Control}</h1>
 
     <p>
-      Jenkins master is now more strict about what commands its slaves can send to the master.
+      Jenkins master is now more strict about what commands its agents can send to the master.
       Unfortunately, this prevents some plugins from functioning correctly, as those plugins do not
-      specify which commands are open for slaves to execute and which ones are not.
+      specify which commands are open for agents to execute and which ones are not.
       While plugin developers work on updating this,
-      as an administrator, you can mark commands as OK for slaves to execute (aka "whitelisting".)
+      as an administrator, you can mark commands as OK for agents to execute (aka "whitelisting".)
     </p>
     <div class="warning" style="margin:1em">
       Please see <a href="http://jenkins-ci.org/security-144">the discussion of this feature</a> to
@@ -41,8 +41,8 @@ THE SOFTWARE.
     </div>
     <j:if test="${it.masterKillSwitch}">
       <div class="warning" style="margin:1em">
-        The slave &#8594; master access control subsystem is currently disabled.
-        This is unsafe if you have slaves from other less trusted people.
+        The agent &#8594; master access control subsystem is currently disabled.
+        This is unsafe if you have agents from other less trusted people.
         You can put it back on from <a href="${rootURL}/configureSecurity">Global Security Configuration UI</a>
       </div>
     </j:if>
@@ -50,7 +50,7 @@ THE SOFTWARE.
     <form method="post" action="submit">
       <h2>Currently Whitelisted Commands</h2>
       <p>
-        The following commands are currently whitelisted for slaves to execute them on the master.
+        The following commands are currently whitelisted for agents to execute them on the master.
         Type in any fully-qualified class names to white list them:
       </p>
       <textarea id="whitelist" name="whitelist" style="width:100%; height:5em">${it.whitelisted.read()}</textarea>
@@ -60,8 +60,8 @@ THE SOFTWARE.
       <j:if test="${!empty(rejectedList)}">
         <h2>Currently Rejected Commands</h2>
         <p>
-          Slaves have attempted to use the following functionalities but the plugins that implement them
-          did not specify whether they are usable from slaves or not. Check ones you want to whitelist:
+          Agents have attempted to use the following functionalities but the plugins that implement them
+          did not specify whether they are usable from agents or not. Check ones you want to whitelist:
         </p>
         <ul style="list-style:none">
           <j:forEach var="r" items="${rejectedList}">
@@ -86,7 +86,7 @@ THE SOFTWARE.
 
       <h2>File Access Rules</h2>
       <p>
-        The following rules control which part of <tt>$JENKINS_HOME</tt> can be access from slaves:
+        The following rules control which part of <tt>$JENKINS_HOME</tt> can be access from agents:
       </p>
       <textarea id="filePathRules" name="filePathRules" style="width:100%; height:5em">${it.filePathRules.read()}</textarea>
       <p>
diff --git a/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_ja.properties b/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_ja.properties
index 4b360251eb..a4a88ca399 100644
--- a/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_ja.properties
+++ b/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_ja.properties
@@ -20,6 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Slave\ &\#8594;\ Master\ Access\ Control=\u30b9\u30ec\u30fc\u30d6 - \u30de\u30b9\u30bf\u9593 \u30a2\u30af\u30bb\u30b9\u5236\u5fa1
 Whitelist=\u30db\u30ef\u30a4\u30c8\u30ea\u30b9\u30c8
 Update=\u66f4\u65b0
diff --git a/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties b/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
index 8ec4887e0e..42d23f6efe 100644
--- a/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
+++ b/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
@@ -20,6 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Slave\ &\#8594;\ Master\ Access\ Control=controle de acesso ao Master slave
 Whitelist=
 Update=
diff --git a/core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.properties b/core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.properties
index 7c847a2111..fe6e52c2b5 100644
--- a/core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.properties
+++ b/core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.properties
@@ -1,2 +1,2 @@
-blurb=Slave to master security subsystem is currently off. \
+blurb=Agent to master security subsystem is currently off. \
   <a href="http://jenkins-ci.org/security-144">Please read the documentation</a> and consider turning it on.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message_pt_BR.properties b/core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message_pt_BR.properties
index 154336201b..9fcd4e1473 100644
--- a/core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message_pt_BR.properties
+++ b/core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message_pt_BR.properties
@@ -22,7 +22,5 @@
 
 Examine=
 Dismiss=
-# Slave to master security subsystem is currently off. \
 # <a href="http://jenkins-ci.org/security-144">Please read the documentation</a> and consider turning it on.
-blurb=O slave para o master security subsystem est\u00e1 desligado. \
   <a href="http://jenkins-ci.org/security-144">Por favor leia a documenta\u00e7\u00e3o</a> e ligue novamente.
diff --git a/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy b/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
new file mode 100644
index 0000000000..27592f6685
--- /dev/null
+++ b/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
@@ -0,0 +1,44 @@
+package jenkins.tools.GlobalToolConfiguration
+
+import hudson.Functions
+import hudson.model.Descriptor
+
+def f=namespace(lib.FormTagLib)
+def l=namespace(lib.LayoutTagLib)
+def st=namespace("jelly:stapler")
+
+l.layout(norefresh:true, permission:app.ADMINISTER, title:my.displayName) {
+    l.side_panel {
+        l.tasks {
+            l.task(icon:"icon-up icon-md", href:rootURL+'/', title:_("Back to Dashboard"))
+            l.task(icon:"icon-setting icon-md", href:"${rootURL}/manage", title:_("Manage Jenkins"))
+        }
+    }
+    l.main_panel {
+        h1 {
+            l.icon(class: 'icon-setting icon-xlg')
+            // TODO more appropriate icon
+            text(my.displayName)
+        }
+
+        p()
+        div(class:"behavior-loading", _("LOADING"))
+
+        f.form(method:"post",name:"config",action:"configure") {
+            Functions.getSortedDescriptorsForGlobalConfig(my.FILTER).each { Descriptor descriptor ->
+                set("descriptor",descriptor)
+                set("instance",descriptor)
+                f.rowSet(name:descriptor.jsonSafeClassName) {
+                    st.include(from:descriptor, page:descriptor.globalConfigPage)
+                }
+            }
+
+            f.bottomButtonBar {
+                f.submit(value:_("Save"))
+                f.apply()
+            }
+        }
+
+        st.adjunct(includes: "lib.form.confirm")
+    }
+}
diff --git a/core/src/main/resources/lib/form/apply.jelly b/core/src/main/resources/lib/form/apply.jelly
index 0551d1d115..86455202ec 100644
--- a/core/src/main/resources/lib/form/apply.jelly
+++ b/core/src/main/resources/lib/form/apply.jelly
@@ -32,8 +32,11 @@ THE SOFTWARE.
     When this button is pressed, the FORM element fires the "jenkins:apply" event
     that allows interested parties to write back whatever states back into the INPUT
     elements.
+    <s:attribute name="value">
+      The text of the apply button.
+    </s:attribute>
   </s:documentation>
   <st:adjunct includes="lib.form.apply.apply"/>
   <input type="hidden" name="core:apply" value="" />
-  <input type="button" value="${%Apply}" class="apply-button applyButton" name="Apply"/><!-- applyButton is legacy -->
+  <input type="button" value="${attrs.value ?: 'Apply'}" class="apply-button applyButton" name="Apply"/><!-- applyButton is legacy -->
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/checkbox.jelly b/core/src/main/resources/lib/form/checkbox.jelly
index 17a3fe6d93..240e612c0e 100644
--- a/core/src/main/resources/lib/form/checkbox.jelly
+++ b/core/src/main/resources/lib/form/checkbox.jelly
@@ -66,7 +66,7 @@ THE SOFTWARE.
          name="${name}"
          value="${attrs.value}"
          title="${attrs.tooltip}"
-         onclick="${attrs.readonly=='true' ? 'return false;' : attrs.onclick}" id="${attrs.id}" class="${attrs.negative!=null ? 'negative' : null} ${attrs.checkUrl!=null?'validated':''}"
+         onclick="${attrs.readonly=='true' ? 'return false;' : attrs.onclick}" id="${attrs.id}" class="${attrs.class} ${attrs.negative!=null ? 'negative' : null} ${attrs.checkUrl!=null?'validated':''}"
          checkUrl="${attrs.checkUrl}" checkDependsOn="${attrs.checkDependsOn}" json="${attrs.json}"
          checked="${value ? 'true' : null}"/>
   <j:if test="${attrs.title!=null}">
diff --git a/core/src/main/resources/lib/form/descriptorList.jelly b/core/src/main/resources/lib/form/descriptorList.jelly
index 23db231665..ec74decd6e 100644
--- a/core/src/main/resources/lib/form/descriptorList.jelly
+++ b/core/src/main/resources/lib/form/descriptorList.jelly
@@ -67,7 +67,7 @@ THE SOFTWARE.
   <j:if test="${!empty(descriptors) or context['org.apache.commons.jelly.body']!=null}">
     <f:section title="${attrs.title}" name="${attrs.field?:attrs.name}">
       <j:if test="${attrs.field!=null}">
-        <tr>
+        <tr class="stapler-class-bag">
           <td>
             <input type="hidden" name="stapler-class-bag" value="true" />
           </td>
diff --git a/core/src/main/resources/lib/form/optionalBlock.jelly b/core/src/main/resources/lib/form/optionalBlock.jelly
index 08408527d7..8133e4c7db 100644
--- a/core/src/main/resources/lib/form/optionalBlock.jelly
+++ b/core/src/main/resources/lib/form/optionalBlock.jelly
@@ -66,9 +66,9 @@ THE SOFTWARE.
 
   <j:choose>
     <j:when test="${attrs.title!=null}">
-      <tr class="optional-block-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
+      <tr class="optional-block-start row-group-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
         <td colspan="3">
-          <f:checkbox name="${attrs.name}" onclick="javascript:updateOptionalBlock(this,true)"
+          <f:checkbox name="${attrs.name}" class="optional-block-control block-control" onclick="javascript:updateOptionalBlock(this,true)"
                       negative="${attrs.negative}" checked="${attrs.checked}" field="${attrs.field}" title="${title}" />
         </td>
         <f:helpLink url="${attrs.help}" featureName="${title}"/>
@@ -79,7 +79,7 @@ THE SOFTWARE.
       <tr class="rowvg-start" />
       <d:invokeBody />
       <!-- end marker -->
-      <tr class="${attrs.inline?'':'row-set-end'} rowvg-end optional-block-end" />
+      <tr class="${attrs.inline?'':'row-set-end'} rowvg-end optional-block-end row-group-end" />
     </j:when>
 
     <j:otherwise>
diff --git a/core/src/main/resources/lib/form/radioBlock.jelly b/core/src/main/resources/lib/form/radioBlock.jelly
index 2a6135a917..ca60fa9554 100644
--- a/core/src/main/resources/lib/form/radioBlock.jelly
+++ b/core/src/main/resources/lib/form/radioBlock.jelly
@@ -54,11 +54,11 @@ THE SOFTWARE.
 
   <st:adjunct includes="lib.form.radioBlock.radioBlock"/>
 
-	<tr class="radio-block-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
+	<tr class="radio-block-start row-group-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
 	  <td colspan="3">
       <label>
 	      <input type="radio" name="${name}" value="${value}"
-             class="radio-block-control" checked="${checked?'true':null}" />
+             class="radio-block-control block-control" checked="${checked?'true':null}" />
         ${title}
       </label>
     </td>
@@ -69,5 +69,5 @@ THE SOFTWARE.
   </j:if>
 	<d:invokeBody />
 	<!-- end marker -->
-	<tr class="${attrs.inline?'':'row-set-end'} radio-block-end" style="display:none" />
+	<tr class="${attrs.inline?'':'row-set-end'} radio-block-end row-group-end" style="display:none" />
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/repeatableDeleteButton.jelly b/core/src/main/resources/lib/form/repeatableDeleteButton.jelly
index e82b2b59b5..9e676217b2 100644
--- a/core/src/main/resources/lib/form/repeatableDeleteButton.jelly
+++ b/core/src/main/resources/lib/form/repeatableDeleteButton.jelly
@@ -32,5 +32,5 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
   <st:adjunct includes="lib.form.repeatable.repeatable"/>
-  <input type="button" value="${attrs.value ?: '%Delete'}" class="repeatable-delete danger" />
+  <input type="button" value="${attrs.value ?: '%Delete'}" title="${attrs.value ?: '%Delete'}" class="repeatable-delete danger" />
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/rowSet.jelly b/core/src/main/resources/lib/form/rowSet.jelly
index 19dd716b87..9b1746395b 100644
--- a/core/src/main/resources/lib/form/rowSet.jelly
+++ b/core/src/main/resources/lib/form/rowSet.jelly
@@ -43,9 +43,9 @@ THE SOFTWARE.
       <d:invokeBody />
     </j:when>
     <j:otherwise>
-      <tr ref="${attrs.ref}" class="row-set-start" style="display:none" name="${attrs.name}" />
+      <tr ref="${attrs.ref}" class="row-set-start row-group-start" style="display:none" name="${attrs.name}" />
       <d:invokeBody />
-      <tr class="row-set-end" />
+      <tr class="row-set-end row-group-end" />
     </j:otherwise>
   </j:choose>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/select/select.js b/core/src/main/resources/lib/form/select/select.js
index 0b7ce9b2c6..0f87d0bbf6 100644
--- a/core/src/main/resources/lib/form/select/select.js
+++ b/core/src/main/resources/lib/form/select/select.js
@@ -43,6 +43,9 @@ function updateListBox(listBox,url,config) {
 Behaviour.specify("SELECT.select", 'select', 1000, function(e) {
 
         function hasChanged(selectEl, originalValue) {
+            // seems like a race condition allows this to fire before the 'selectEl' is defined. If that happens, exit..
+            if(!selectEl || !selectEl.options || !selectEl.options.length > 0)
+              return false;
             var firstValue = selectEl.options[0].value;
             var selectedValue = selectEl.value;
             if (originalValue == "" && selectedValue == firstValue) {
diff --git a/core/src/main/resources/lib/form/slave-mode.jelly b/core/src/main/resources/lib/form/slave-mode.jelly
index da161ce108..61c8edc299 100644
--- a/core/src/main/resources/lib/form/slave-mode.jelly
+++ b/core/src/main/resources/lib/form/slave-mode.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
-    listbox for choosing the slave's usage.
+    listbox for choosing the agent's usage.
 
     <st:attribute name="name">
       Name of the &lt;select> element.
diff --git a/core/src/main/resources/lib/hudson/ballColorTd.jelly b/core/src/main/resources/lib/hudson/ballColorTd.jelly
index 9889dbaf59..b8634c9ad7 100644
--- a/core/src/main/resources/lib/hudson/ballColorTd.jelly
+++ b/core/src/main/resources/lib/hudson/ballColorTd.jelly
@@ -71,7 +71,7 @@ THE SOFTWARE.
             <j:otherwise>
               <!-- We don't seem to have this icon in the IconSet... fallback again... -->
               <j:set var="iconUrl" value="${it.getImageOf(iconSize)}"/>
-              <l:icon src="${iconUrl}" alt="${it.description}" tooltip="${it.description}" style="${attrs.style}" />
+              <l:icon src="${iconUrl}" class="${iconSizeClass}" alt="${it.description}" tooltip="${it.description}" style="${attrs.style}" />
             </j:otherwise>
           </j:choose>
         </j:otherwise>
diff --git a/core/src/main/resources/lib/hudson/project/config-assignedLabel.jelly b/core/src/main/resources/lib/hudson/project/config-assignedLabel.jelly
index 9959f6d18d..d242e803f9 100644
--- a/core/src/main/resources/lib/hudson/project/config-assignedLabel.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-assignedLabel.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <!-- master/slave -->
+  <!-- master/agent -->
   <j:if test="${app.labels.size() gt 1 || app.clouds.size() gt 0 || (it.assignedLabel!=null and it.assignedLabel!=app.selfLabel)}">
     <f:optionalBlock name="hasSlaveAffinity" title="${%Restrict where this project can be run}" checked="${it.assignedLabel!=null}" field="slaveAffinity" inline="true">
       <f:entry title="${%Label Expression}" field="label">
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild.jelly b/core/src/main/resources/lib/hudson/project/config-disableBuild.jelly
index 12738ee939..024974a087 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild.jelly
@@ -23,10 +23,10 @@ THE SOFTWARE.
 -->
 
 <!--
-  Configuration entry for disabling builds
+  Configuration entry for disabling a project
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:optionalBlock name="disable" title="${%Disable Build} (${%No new builds will be executed until the project is re-enabled.})" checked="${it.disabled}"
+  <f:optionalBlock name="disable" title="${%Disable this project}" checked="${it.disabled}"
                    help="/help/project-config/disable.html" inline="true" />
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_bg.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_bg.properties
index 8717d41f6d..3448ec1467 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_bg.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_bg.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=\u0417\u0430\u043C\u0440\u0430\u0437\u0438 \u0431\u0438\u043B\u0434\u0430
+Disable\ this\ project=\u0417\u0430\u043C\u0440\u0430\u0437\u0438 \u0431\u0438\u043B\u0434\u0430
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_da.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_da.properties
index a3677c10af..66d121002c 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_da.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_da.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=Sl\u00e5 Byg Fra
+Disable\ this\ project=Sl\u00e5 Byg Fra
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Der vil ikke blive udf\u00f8rt flere byg f\u00f8r projektet bliver sl\u00e5et til igen.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_de.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_de.properties
index 37ac915fb4..2246901787 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_de.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_de.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=Projekt deaktivieren
+Disable\ this\ project=Projekt deaktivieren
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Es werden keine weiteren Builds ausgef�hrt, bis das Projekt wieder reaktiviert wird.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_es.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_es.properties
index 9005dc80a7..5e658f9de1 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_es.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_es.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=Desactivar la ejecuci�n
+Disable\ this\ project=Desactivar la ejecuci�n
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=No se ejecutar� nuevamente hasta que el proyecto sea reactivado.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_fr.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_fr.properties
index 8154a99aab..11facdcf21 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_fr.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_fr.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=D\u00e9sactiver le projet
+Disable\ this\ project=D\u00e9sactiver le projet
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Aucun nouveau build ne sera ex\u00e9cut\u00e9 jusqu''\u00e0 ce que le projet soit r\u00e9activ\u00e9.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_he.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_he.properties
index effaf6d86e..0abc35b1bd 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_he.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_he.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Disable\ Build=\u05E9\u05EA\u05E7 \u05D1\u05E0\u05D9\u05D4
+Disable\ this\ project=\u05E9\u05EA\u05E7 \u05D1\u05E0\u05D9\u05D4
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=\u05D1\u05E0\u05D9\u05D5\u05EA \u05D7\u05D3\u05E9\u05D5\u05EA \u05DC\u05D0 \u05D9\u05D5\u05E4\u05E2\u05DC\u05D5 \u05E2\u05D3 \u05E9\u05D1\u05E0\u05D9\u05D4 \u05D6\u05D5 \u05EA\u05D0\u05D5\u05E4\u05E9\u05E8 \u05D1\u05E9\u05E0\u05D9\u05EA
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_hu.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_hu.properties
index d2fb9342e7..57047b4d70 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_hu.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_hu.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Disable\ Build=\u00C9p\u00EDt\u00E9s tilt\u00E1sa
+Disable\ this\ project=\u00C9p\u00EDt\u00E9s tilt\u00E1sa
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=A projekt \u00FAjraenged\u00E9lyez\u00E9s\u00E9ig nem lesz \u00FAj ford\u00EDt\u00E1s elind\u00EDtva.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_it.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_it.properties
index 43b7b20a6e..d03554a8cf 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_it.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_it.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=Disabilita Build
+Disable\ this\ project=Disabilita Build
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Non saranno effettuate nuove build finch\u00E8 questo progetto non sar\u00E0 riattivato.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_ja.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_ja.properties
index 7828ac92ce..c04759fdc0 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_ja.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_ja.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=\u30d3\u30eb\u30c9\u7121\u52b9\u5316
+Disable\ this\ project=\u30d3\u30eb\u30c9\u7121\u52b9\u5316
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u518d\u3073\u6709\u52b9\u5316\u3055\u308c\u308b\u307e\u3067\u65b0\u3057\u3044\u30d3\u30eb\u30c9\u306f\u884c\u308f\u308c\u306a\u304f\u306a\u308a\u307e\u3059
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_ko.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_ko.properties
index 5f0373ef61..355ef2daea 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_ko.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_ko.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=\uBE4C\uB4DC \uC548\uD568
+Disable\ this\ project=\uBE4C\uB4DC \uC548\uD568
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=\uD504\uB85C\uC81D\uD2B8\uAC00 \uB2E4\uC2DC \uBE4C\uB4DC\uB97C \uD560 \uB54C\uAE4C\uC9C0 \uC0C8\uB85C\uC6B4 \uBE4C\uB4DC\uAC00 \uC2E4\uD589\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_lt.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_lt.properties
index 87f83496b0..c7153ef88a 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_lt.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_lt.properties
@@ -1,3 +1,3 @@
 # This file is under the MIT License by authors
 
-Disable\ Build=I\u0161jungti darb\u0105
+Disable\ this\ project=I\u0161jungti darb\u0105
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_nb_NO.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_nb_NO.properties
index a46d1293e1..05e1045842 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_nb_NO.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_nb_NO.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=Deaktiver bygg
+Disable\ this\ project=Deaktiver bygg
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Ingen nye builds blir utf\u00F8rt f\u00F8r prosjektet er reaktivert.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_nl.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_nl.properties
index 7364856e7c..8c6de81a11 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_nl.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_nl.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=Bouwen deactiveren
+Disable\ this\ project=Bouwen deactiveren
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Er zullen geen nieuwe bouwpogingen uitgevoerd worden tot het project opnieuw geactiveerd wordt.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_pl.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_pl.properties
index 333abf8bd9..dbf0f019a5 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_pl.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_pl.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Disable\ Build=Zablokuj zadania
+Disable\ this\ project=Zablokuj zadania
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Nowe zadania nie b\u0119d\u0105 wykonywane dop\u00F3ki projekt nie b\u0119dzie odblokowany
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_pt_BR.properties
index 9a7714e945..dc0d7e5c8b 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_pt_BR.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_pt_BR.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=Desabilitar builds
+Disable\ this\ project=Desabilitar builds
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Nenhum novo build ser\u00e1 executado at\u00e9 que este projeto seja habilitado novamente.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_ro.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_ro.properties
index 580183571c..1b9a9a3661 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_ro.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_ro.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Disable\ Build=Dezactiveaza Build
+Disable\ this\ project=Dezactiveaza Build
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Nici un build nou nu va fi executat pana cand proiectul nu va fi re-activat.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_ru.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_ru.properties
index b05d70af55..0ec634790b 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_ru.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_ru.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=\u041f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0431\u043e\u0440\u043a\u0438
+Disable\ this\ project=\u041f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0431\u043e\u0440\u043a\u0438
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=\u041d\u043e\u0432\u044b\u0435 \u0441\u0431\u043e\u0440\u043a\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0442\u044c\u0441\u044f \u043f\u043e\u043a\u0430 \u043e\u043f\u0446\u0438\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0430
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_sk.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_sk.properties
index 1898b3d0da..315b7a2623 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_sk.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_sk.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Disable\ Build=Zak\u00E1\u017E zostavenie
+Disable\ this\ project=Zak\u00E1\u017E zostavenie
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Nebud\u00FA sa da\u0165 sp\u00FA\u0161\u0165a\u0165 nov\u00E9 zostavenia, k\u00FDm sa projekt znova nepovol\u00ED.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_sv_SE.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_sv_SE.properties
index 9036e3e948..dbe3eaddaf 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_sv_SE.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_sv_SE.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=Inaktivera bygge
+Disable\ this\ project=Inaktivera bygge
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Inga nya byggen utf\u00F6rs f\u00F6rr\u00E4n projektet aktiveras igen.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_tr.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_tr.properties
index d4d53140f7..15a58e51c6 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_tr.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_tr.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=Yap\u0131land\u0131rmay\u0131 devre d\u0131\u015f\u0131 b\u0131rak
+Disable\ this\ project=Yap\u0131land\u0131rmay\u0131 devre d\u0131\u015f\u0131 b\u0131rak
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Proje yeniden devreye al\u0131nana kadar yeni yap\u0131land\u0131rma \u00e7al\u0131\u015ft\u0131r\u0131lmayacakt\u0131r.
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_uk.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_uk.properties
index f115b9e5f6..7e01441537 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_uk.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_uk.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Disable\ Build=\u0414\u0435\u0430\u043A\u0442\u0438\u0432\u0443\u0432\u0430\u0442\u0438 \u0431\u0456\u043B\u0434
+Disable\ this\ project=\u0414\u0435\u0430\u043A\u0442\u0438\u0432\u0443\u0432\u0430\u0442\u0438 \u0431\u0456\u043B\u0434
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=\u041D\u0435 \u0431\u0443\u0434\u0443\u0432\u0430\u0442\u0438 \u0434\u043E\u043A\u0438 \u043F\u0440\u043E\u0435\u043A\u0442 \u043D\u0435 \u0434\u043E\u0437\u0432\u043E\u043B\u044F\u0442\u044C
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_zh_CN.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_zh_CN.properties
index 2628879777..a7293c119b 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_zh_CN.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_zh_CN.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=\u5173\u95ED\u6784\u5EFA
+Disable\ this\ project=\u5173\u95ED\u6784\u5EFA
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=\u91CD\u65B0\u5F00\u542F\u6784\u5EFA\u524D\u4E0D\u5141\u8BB8\u8FDB\u884C\u65B0\u7684\u6784\u5EFA
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_zh_TW.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_zh_TW.properties
index f5715d1826..e929ce787a 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild_zh_TW.properties
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_zh_TW.properties
@@ -21,5 +21,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Build=\u505C\u7528Build
+Disable\ this\ project=\u505C\u7528Build
 No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=\u5728\u5C08\u6848\u88AB\u91CD\u65B0\u555F\u7528\u524D\u5C07\u4E0D\u518D\u57F7\u884C\u65B0\u7684\u5EFA\u69CB
diff --git a/core/src/main/resources/lib/hudson/project/configurable.jelly b/core/src/main/resources/lib/hudson/project/configurable.jelly
index c58263ce8c..435a804ab6 100644
--- a/core/src/main/resources/lib/hudson/project/configurable.jelly
+++ b/core/src/main/resources/lib/hudson/project/configurable.jelly
@@ -39,10 +39,10 @@ THE SOFTWARE.
     <l:task confirmationMessage="${%delete.confirm(it.pronoun, it.displayName)}" href="${url}/doDelete" icon="icon-edit-delete icon-md" permission="${it.DELETE}" post="true" requiresConfirmation="true" title="${%delete(it.pronoun)}"/>
     <j:choose>
         <j:when test="${h.hasPermission(it,it.CONFIGURE)}">
-            <l:task href="${url}/configure" icon="icon-setting icon-md" title="${%Configure}"/>
+            <l:task href="${url}/configure" icon="icon-gear2 icon-md" title="${%Configure}"/>
         </j:when>
         <j:when test="${h.hasPermission(it,it.EXTENDED_READ)}">
-            <l:task href="${url}/configure" icon="icon-setting icon-md" title="${%View Configuration}"/>
+            <l:task href="${url}/configure" icon="icon-gear2 icon-md" title="${%View Configuration}"/>
         </j:when>
     </j:choose>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/scriptConsole.jelly b/core/src/main/resources/lib/hudson/scriptConsole.jelly
index bf2195db5b..6c10838ae3 100644
--- a/core/src/main/resources/lib/hudson/scriptConsole.jelly
+++ b/core/src/main/resources/lib/hudson/scriptConsole.jelly
@@ -58,7 +58,7 @@ THE SOFTWARE.
           </j:if>
         </j:when>
         <j:otherwise>
-          ${%It is not possible to run scripts when slave is offline.}
+          ${%It is not possible to run scripts when agent is offline.}
         </j:otherwise>
       </j:choose>
     </l:main-panel>
diff --git a/core/src/main/resources/lib/layout/css.jelly b/core/src/main/resources/lib/layout/css.jelly
new file mode 100644
index 0000000000..a15d383023
--- /dev/null
+++ b/core/src/main/resources/lib/layout/css.jelly
@@ -0,0 +1,37 @@
+<!--
+The MIT License
+
+Copyright (c) 2016, CloudBees
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+  <st:documentation>
+    Client-side CSS loading tag. Similar to adjunct, but driven from the client. See page-init.js.
+
+    @since 2.0
+    <st:attribute name="src" required="true">
+      CSS source path (relative to Jenkins).
+    </st:attribute>
+  </st:documentation>
+
+  <div class="jenkins-css-load" data-src="${attrs.src}" />
+</j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/layout/html.jelly b/core/src/main/resources/lib/layout/html.jelly
new file mode 100644
index 0000000000..661e7b3c6d
--- /dev/null
+++ b/core/src/main/resources/lib/layout/html.jelly
@@ -0,0 +1,176 @@
+<!--
+The MIT License
+
+Copyright (c) 2004-2016, Sun Microsystems, Inc., Kohsuke Kawaguchi,
+Daniel Dyer, Seiji Sogabe, Tom Huybrechts, Manufacture Francaise des Pneumatiques
+Michelin, Romain Seguy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:i="jelly:fmt" xmlns:x="jelly:xml">
+  <st:documentation>
+    Outer-most tag for a normal (non-AJAX) HTML rendering.
+    This is used with nested &lt;header>, &lt;side-panel>, and &lt;main-panel>
+    to form Jenkins's basic HTML layout.
+
+    <st:attribute name="title" use="required">
+      Title of the HTML page. Rendered into &lt;title> tag.
+    </st:attribute>
+    <st:attribute name="norefresh">
+      If non-null and not "false", auto refresh is disabled on this page.
+      This is necessary for pages that include forms.
+    </st:attribute>
+    <st:attribute name="css" deprecated="true">
+      specify path that starts from "/" for loading additional CSS stylesheet.
+      path is interprted as relative to the context root. e.g.,
+
+      {noformat}&lt;l:layout css="/plugin/mysuperplugin/css/myneatstyle.css">{noformat}
+
+      This was originally added to allow plugins to load their stylesheets, but
+      *the use of thie attribute is discouraged now.*
+      plugins should now do so by inserting &lt;style> elements and/or &lt;script> elements
+      in &lt;l:header/> tag.
+    </st:attribute>
+    <st:attribute name="permission">
+      If given, this page is only made available to users that has the specified permission.
+      (The permission will be checked against the "it" object.)
+    </st:attribute>
+  </st:documentation>
+<st:setHeader name="Expires" value="0" />
+<st:setHeader name="Cache-Control" value="no-cache,no-store,must-revalidate" />
+<st:setHeader name="X-Hudson-Theme" value="default" />
+<st:contentType value="text/html;charset=UTF-8" />
+
+  <j:new var="h" className="hudson.Functions" /><!-- instead of JSP functions -->
+${h.initPageVariables(context)}
+<!--
+  depending on what tags are used, we can later end up discovering that we needed a session,
+  but it's too late because the headers are already committed. so ensure we always have a session.
+  this also allows us to configure HttpSessionContextIntegrationFilter not to create sessions,
+  which I suspect can end up creating sessions for wrong resource types (such as static resources.)
+-->
+<j:set var="isMSIE" value="${userAgent.contains('MSIE')}"/>
+<j:set var="_" value="${request.getSession()}"/>
+<j:set var="_" value="${h.configureAutoRefresh(request, response, attrs.norefresh!=null and !attrs.norefresh.equals(false))}"/>
+  <j:set var="extensionsAvailable" value="${h.extensionsAvailable}"/>
+  <j:if test="${request.servletPath=='/' || request.servletPath==''}">
+    ${h.advertiseHeaders(response)}
+    <j:if test="${extensionsAvailable}">
+      <j:forEach var="pd" items="${h.pageDecorators}">
+        <st:include it="${pd}" page="httpHeaders.jelly" optional="true"/>
+      </j:forEach>
+    </j:if>
+  </j:if>
+<x:doctype name="html" />
+<html>
+  <head data-rooturl="${rootURL}" data-resurl="${resURL}" resURL="${resURL}">
+    ${h.checkPermission(it,permission)}
+
+    <j:if test="${isMSIE}">
+      <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
+    </j:if>
+
+    <title>${h.appendIfNotNull(title, ' [Jenkins]', 'Jenkins')}</title>
+    <link rel="stylesheet" href="${resURL}/css/style.css" type="text/css" />
+    <link rel="stylesheet" href="${resURL}/css/color.css" type="text/css" />
+    <link rel="stylesheet" href="${resURL}/css/responsive-grid.css" type="text/css" />
+    <j:if test="${attrs.css!=null}">
+      <link rel="stylesheet" href="${resURL}${attrs.css}" type="text/css" />
+    </j:if>
+    <link rel="shortcut icon" href="${resURL}/favicon.ico" type="image/vnd.microsoft.icon" />
+    <link rel="mask-icon" href="${rootURL}/images/mask-icon.svg" color="black" />
+
+    <!-- are we running as an unit test? -->
+    <script>var isRunAsTest=${h.isUnitTest}; var rootURL="${rootURL}"; var resURL="${resURL}";</script>
+
+    <script src="${resURL}/scripts/prototype.js" type="text/javascript"/>
+    <script src="${resURL}/scripts/behavior.js" type="text/javascript"/>
+
+    <!-- we include our own prototype.js, so don't let stapler pull in another. -->
+    <st:adjunct assumes="org.kohsuke.stapler.framework.prototype.prototype"
+                includes="org.kohsuke.stapler.bind"/>
+
+    <!-- To use the debug version of YUI, set the system property 'debug.YUI' to true -->
+    <j:set var="yuiSuffix" value="${h.yuiSuffix}" />
+    <l:yui module="yahoo" />
+    <l:yui module="dom" />
+    <l:yui module="event" />
+    <j:if test="${h.yuiSuffix=='debug'}">
+      <l:yui module="logger" />
+    </j:if>
+    <l:yui module="animation" />
+    <l:yui module="dragdrop" />
+    <l:yui module="container" />
+    <l:yui module="connection" />
+    <l:yui module="datasource" />
+    <l:yui module="autocomplete" />
+    <l:yui module="menu" />
+    <l:yui module="element" />
+    <l:yui module="button" />
+    <l:yui module="storage" />
+    <!--l:yui module="editor" suffix="-beta" /-->
+
+    <script src="${resURL}/scripts/hudson-behavior.js" type="text/javascript"></script>
+    <script src="${resURL}/scripts/sortable.js" type="text/javascript"/>
+
+    <j:if test="${extensionsAvailable}">
+      <script>
+          crumb.init("${h.getCrumbRequestField()}", "${h.getCrumb(request)}");
+      </script>
+    </j:if>
+
+    <link rel="stylesheet" href="${resURL}/scripts/yui/container/assets/container.css" type="text/css"/>
+    <link rel="stylesheet" href="${resURL}/scripts/yui/assets/skins/sam/skin.css" type="text/css" />
+    <link rel="stylesheet" href="${resURL}/scripts/yui/container/assets/skins/sam/container.css" type="text/css"/>
+    <link rel="stylesheet" href="${resURL}/scripts/yui/button/assets/skins/sam/button.css" type="text/css" />
+    <link rel="stylesheet" href="${resURL}/scripts/yui/menu/assets/skins/sam/menu.css" type="text/css" />
+    <!--link rel="stylesheet" href="${resURL}/scripts/yui/editor/assets/skins/sam/editor.css" type="text/css" /-->
+
+    <l:hasPermission permission="${app.READ}">
+      <link rel="search" type="application/opensearchdescription+xml" href="${rootURL}/opensearch.xml" title="Jenkins" />
+    </l:hasPermission>
+    <meta name="ROBOTS" content="INDEX,NOFOLLOW" />
+    <j:set var="mode" value="header" />
+    <d:invokeBody />
+    <j:if test="${extensionsAvailable}">
+      <j:forEach var="pd" items="${h.pageDecorators}">
+        <st:include it="${pd}" page="header.jelly" optional="true" />
+      </j:forEach>
+    </j:if>
+
+    <j:invokeStatic var="j" className="jenkins.model.Jenkins" method="getInstance" />
+    <j:if test="${!j.installState.setupComplete}">
+      <script src="${resURL}/${j.installWizardPath}.js" type="text/javascript"/>
+      <link rel="stylesheet" href="${resURL}/${j.installWizardPath}.css" type="text/css" />
+    </j:if>
+
+    <j:if test="${isMSIE}">
+      <script src="${resURL}/scripts/msie.js" type="text/javascript"/>
+    </j:if>
+
+  </head>
+  <body id="jenkins" class="yui-skin-sam jenkins-${h.version}" data-version="jenkins-${h.version}" data-model-type="${it.class.name}">
+      <div id="main-panel" style="margin-left: 0;">
+         <j:set var="mode" value="main-panel" />
+         <d:invokeBody />
+      </div>
+  </body>
+</html>
+</j:jelly>
diff --git a/core/src/main/resources/lib/layout/js.jelly b/core/src/main/resources/lib/layout/js.jelly
new file mode 100644
index 0000000000..88edf8dafd
--- /dev/null
+++ b/core/src/main/resources/lib/layout/js.jelly
@@ -0,0 +1,37 @@
+<!--
+The MIT License
+
+Copyright (c) 2016, CloudBees
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+  <st:documentation>
+    Client-side JavaScript loading tag. Similar to adjunct, but driven from the client. See page-init.js.
+
+    @since 2.0
+    <st:attribute name="src" required="true">
+      JavaScript source path (relative to Jenkins).
+    </st:attribute>
+  </st:documentation>
+
+  <div class="jenkins-js-load" data-src="${attrs.src}" />
+</j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 9746a6a173..2fde584a06 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -37,6 +37,9 @@ THE SOFTWARE.
       If non-null and not "false", auto refresh is disabled on this page.
       This is necessary for pages that include forms.
     </st:attribute>
+    <st:attribute name="cssclass">
+      A css class name to include in the body element.
+    </st:attribute>
     <st:attribute name="css" deprecated="true">
       specify path that starts from "/" for loading additional CSS stylesheet.
       path is interprted as relative to the context root. e.g.,
@@ -80,7 +83,7 @@ ${h.initPageVariables(context)}
   </j:if>
 <x:doctype name="html" />
 <html>
-  <head resURL="${resURL}">
+  <head data-rooturl="${rootURL}" data-resurl="${resURL}" resURL="${resURL}">
     ${h.checkPermission(it,permission)}
 
     <j:if test="${isMSIE}">
@@ -159,8 +162,10 @@ ${h.initPageVariables(context)}
       <script src="${resURL}/scripts/msie.js" type="text/javascript"/>
     </j:if>
 
+    <script src="${resURL}/jsbundles/page-init.js" type="text/javascript"/>
+
   </head>
-  <body id="jenkins" class="yui-skin-sam jenkins-${h.version}" data-version="jenkins-${h.version}" data-model-type="${it.class.name}">
+  <body id="jenkins" class="yui-skin-sam jenkins-${h.version} ${attrs.cssclass}" data-version="jenkins-${h.version}" data-model-type="${it.class.name}">
     <!-- for accessibility, skip the entire navigation bar and etc and go straight to the head of the content -->
     <a href="#skip2content" class="skiplink">Skip to content</a>
 
diff --git a/core/src/test/java/hudson/ClassicPluginStrategyTest.java b/core/src/test/java/hudson/ClassicPluginStrategyTest.java
new file mode 100644
index 0000000000..bb19c5f81b
--- /dev/null
+++ b/core/src/test/java/hudson/ClassicPluginStrategyTest.java
@@ -0,0 +1,69 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson;
+
+import hudson.util.VersionNumber;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.List;
+
+import static hudson.ClassicPluginStrategy.DetachedPlugin;
+
+/**
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ */
+public class ClassicPluginStrategyTest {
+
+    @Test
+    public void test_getDetachedPlugins() {
+        List<DetachedPlugin> list = ClassicPluginStrategy.getDetachedPlugins(new VersionNumber("1.296"));
+
+        Assert.assertTrue(list.size() >= 14); // There were 14 at the time of writing this test
+        Assert.assertNotNull(findPlugin("maven-plugin", list));
+        Assert.assertNotNull(findPlugin("subversion", list));
+
+        // Narrow the list to since "1.310" (the subversion detach version).
+        list = ClassicPluginStrategy.getDetachedPlugins(new VersionNumber("1.310"));
+        // Maven should no longer be in the list, but subversion should.
+        Assert.assertNull(findPlugin("maven-plugin", list));
+        Assert.assertNotNull(findPlugin("subversion", list));
+
+        // Narrow the list to since "1.311" (after the subversion detach version).
+        list = ClassicPluginStrategy.getDetachedPlugins(new VersionNumber("1.311"));
+        // Neither Maven or subversion should be in the list.
+        Assert.assertNull(findPlugin("maven-plugin", list));
+        Assert.assertNull(findPlugin("subversion", list));
+    }
+
+    private DetachedPlugin findPlugin(String shortName, List<DetachedPlugin> list) {
+        for (DetachedPlugin detachedPlugin : list) {
+            if (detachedPlugin.getShortName().equals(shortName)) {
+                return detachedPlugin;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/core/src/test/java/hudson/util/JSONObjectResponseTest.java b/core/src/test/java/hudson/util/JSONObjectResponseTest.java
new file mode 100644
index 0000000000..f84b574bfb
--- /dev/null
+++ b/core/src/test/java/hudson/util/JSONObjectResponseTest.java
@@ -0,0 +1,56 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.util;
+
+import net.sf.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ */
+public class JSONObjectResponseTest {
+
+    @Test
+    public void test() {
+        Map<String, String> data = new HashMap<>();
+
+        data.put("val_1", "1");
+
+        HttpResponses.JSONObjectResponse response = new HttpResponses.JSONObjectResponse(data);
+        JSONObject payload = response.getJsonObject();
+
+        Assert.assertEquals("ok", payload.getString("status"));
+        JSONObject payloadData = payload.getJSONObject("data");
+        Assert.assertEquals("1", payloadData.getString("val_1"));
+
+        // change it to an error
+        response.error("a message");
+        Assert.assertEquals("error", payload.getString("status"));
+        Assert.assertEquals("a message", payload.getString("message"));
+    }
+}
diff --git a/core/src/test/java/jenkins/util/ResourceBundleUtilTest.java b/core/src/test/java/jenkins/util/ResourceBundleUtilTest.java
new file mode 100644
index 0000000000..1e8c24b569
--- /dev/null
+++ b/core/src/test/java/jenkins/util/ResourceBundleUtilTest.java
@@ -0,0 +1,69 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins.util;
+
+import net.sf.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Locale;
+import java.util.MissingResourceException;
+
+/**
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ */
+public class ResourceBundleUtilTest {
+
+    /**
+     * Test resource bundle loading for a defined locale.
+     */
+    @Test
+    public void test_known_locale() {
+        JSONObject bundle = ResourceBundleUtil.getBundle("hudson.logging.Messages", Locale.GERMAN);
+        Assert.assertEquals("Initialisiere Log-Rekorder", bundle.getString("LogRecorderManager.init"));
+        bundle = ResourceBundleUtil.getBundle("hudson.logging.Messages", new Locale("pt"));
+        Assert.assertEquals("Inicializando registros de log", bundle.getString("LogRecorderManager.init"));
+
+        // Test caching - should get the same bundle instance back...
+        Assert.assertTrue(ResourceBundleUtil.getBundle("hudson.logging.Messages", new Locale("pt")) == bundle);
+    }
+
+    /**
+     * Test that we get the "default" bundle for an unknown locale.
+     */
+    @Test
+    public void test_unknown_locale() {
+        JSONObject bundle = ResourceBundleUtil.getBundle("hudson.logging.Messages", new Locale("kok")); // konkani
+        Assert.assertEquals("Initialing log recorders", bundle.getString("LogRecorderManager.init"));
+
+    }
+
+    /**
+     * Test unknown bundle.
+     */
+    @Test(expected = MissingResourceException.class)
+    public void test_unknown_bundle() {
+        ResourceBundleUtil.getBundle("hudson.blah.Whatever");
+    }
+}
diff --git a/core/src/test/java/jenkins/xml/XMLUtilsTest.java b/core/src/test/java/jenkins/xml/XMLUtilsTest.java
index b71700ba0d..0211653cf3 100644
--- a/core/src/test/java/jenkins/xml/XMLUtilsTest.java
+++ b/core/src/test/java/jenkins/xml/XMLUtilsTest.java
@@ -26,17 +26,24 @@ package jenkins.xml;
 
 import jenkins.util.xml.XMLUtils;
 
+import org.junit.Assert;
 import org.junit.Test;
 
+import java.io.File;
+import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.net.URL;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.xpath.XPathExpressionException;
 
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertThat;
 import org.jvnet.hudson.test.Issue;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
 
 public class XMLUtilsTest {
 
@@ -97,4 +104,30 @@ public class XMLUtilsTest {
         assertThat(stringWriter.toString(), containsString("<description>&amp;</description>"));
     }
 
+    /**
+     * Tests getValue() directly. Tests the parse methods too (indirectly - yeah, a purest would have
+     * tests for each).
+     */
+    @Test
+    public void testGetValue() throws XPathExpressionException, SAXException, IOException {
+        URL configUrl = getClass().getResource("/jenkins/xml/config.xml");
+        File configFile = new File(configUrl.getFile());
+
+        Assert.assertEquals("1.480.1", XMLUtils.getValue("/hudson/version", configFile));
+        Assert.assertEquals("", XMLUtils.getValue("/hudson/unknown-element", configFile));
+    }
+    
+    @Test
+    public void testParse_with_XXE() throws IOException, XPathExpressionException {
+        try {
+            Document doc = XMLUtils.parse(new StringReader("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                    "<!DOCTYPE foo [\n" +
+                    "   <!ELEMENT foo ANY >\n" +
+                    "   <!ENTITY xxe SYSTEM \"http://abc.com/temp/test.jsp\" >]> " +
+                    "<foo>&xxe;</foo>"));
+            Assert.fail("Expecting SAXException for XXE.");
+        } catch (SAXException e) {
+            assertThat(e.getMessage(), containsString("DOCTYPE is disallowed"));
+        }
+    }    
 }
diff --git a/core/src/test/resources/jenkins/xml/config.xml b/core/src/test/resources/jenkins/xml/config.xml
new file mode 100644
index 0000000000..c3a76a6eef
--- /dev/null
+++ b/core/src/test/resources/jenkins/xml/config.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson>
+    <disabledAdministrativeMonitors/>
+    <version>1.480.1</version>
+    <numExecutors>2</numExecutors>
+    <mode>NORMAL</mode>
+    <!-- Yeah, we deleted a lot of this ... fine for testing. -->
+</hudson>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dad4a14c2d..ce48a86bde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.657-SNAPSHOT</version>
+  <version>2.0-rc-2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -322,7 +322,17 @@ THE SOFTWARE.
               <artifactId>servlet-api</artifactId>
               <version>2.4</version>
             </dependency>
+            <dependency>
+              <groupId>org.codehaus.gmaven.runtime</groupId>
+              <artifactId>gmaven-runtime-2.0</artifactId>
+              <version>1.5-jenkins-3</version>
+            </dependency>
           </dependencies>
+          <configuration>
+            <!-- 2.4 not yet supported by plugin but 2.0 works
+                 here so long as we provide explicit version -->
+            <providerSelection>2.0</providerSelection>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -499,7 +509,7 @@ THE SOFTWARE.
           <!-- this is really just a patched version of maven-jetty-plugin to workaround issue #932 -->
           <groupId>org.jenkins-ci.tools</groupId>
           <artifactId>maven-jenkins-dev-plugin</artifactId>
-          <version>8.1.4.v20120524-jenkins-1</version>
+          <version>9.2.15.v20160210-jenkins-1</version>
         </plugin>
         <plugin>
           <groupId>org.jvnet.updatecenter2</groupId>
@@ -509,7 +519,7 @@ THE SOFTWARE.
         <plugin>
           <groupId>org.jenkins-ci.tools</groupId>
           <artifactId>maven-hpi-plugin</artifactId>
-          <version>1.114</version>
+          <version>1.116</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -723,18 +733,6 @@ THE SOFTWARE.
             </goals>
           </execution>
         </executions>
-        <configuration>
-           <!-- 1.8 not yet supported by plugin but 1.7 works
-                here so long as we provide explicit version -->
-           <providerSelection>1.7</providerSelection>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.gmaven.runtime</groupId>
-            <artifactId>gmaven-runtime-1.7</artifactId>
-            <version>1.3</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
 
diff --git a/test/pom.xml b/test/pom.xml
index bc4067029b..5529dfa523 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.657-SNAPSHOT</version>
+    <version>2.0-rc-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>test</artifactId>
@@ -201,7 +201,7 @@ THE SOFTWARE.
         <artifactId>maven-surefire-plugin</artifactId>
         <!-- version specified in grandparent pom -->
         <configuration>
-          <argLine>${jacocoSurefireArgs} -Dfile.encoding=UTF-8 -Xmx256m -XX:MaxPermSize=128m</argLine>
+          <argLine>${jacocoSurefireArgs} -Dfile.encoding=UTF-8 -Xmx1g -XX:MaxPermSize=128m</argLine>
           <systemPropertyVariables>
               <!-- use AntClassLoader that supports predictable file handle release -->
               <hudson.ClassicPluginStrategy.useAntClassLoader>true</hudson.ClassicPluginStrategy.useAntClassLoader>
@@ -238,15 +238,7 @@ THE SOFTWARE.
             <artifactId>ant-launcher</artifactId>
             <version>1.8.0</version>
           </dependency>
-          <dependency>
-            <groupId>org.codehaus.gmaven.runtime</groupId>
-            <artifactId>gmaven-runtime-2.0</artifactId>
-            <version>1.5-jenkins-1</version>
-          </dependency>
         </dependencies>
-        <configuration>
-          <providerSelection>2.0</providerSelection>
-        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/test/src/test/groovy/hudson/model/SlaveTest.groovy b/test/src/test/groovy/hudson/model/SlaveTest.groovy
index 83620674f4..35299a7e4f 100644
--- a/test/src/test/groovy/hudson/model/SlaveTest.groovy
+++ b/test/src/test/groovy/hudson/model/SlaveTest.groovy
@@ -28,6 +28,7 @@ import static hudson.util.FormValidation.Kind.WARNING
 import static org.junit.Assert.assertNotNull
 import static org.junit.Assert.assertEquals
 
+import hudson.security.csrf.CrumbIssuer
 import hudson.slaves.DumbSlave
 import hudson.slaves.JNLPLauncher
 import hudson.util.FormValidation
@@ -84,7 +85,7 @@ class SlaveTest {
         HttpURLConnection con = new URL(j.getURL(),url).openConnection();
         con.requestMethod = "POST"
         con.setRequestProperty("Content-Type","application/xml;charset=UTF-8")
-        con.setRequestProperty(".crumb","test")
+        con.setRequestProperty(CrumbIssuer.DEFAULT_CRUMB_NAME,"test")
         con.doOutput = true;
         con.outputStream.write(xml.getBytes("UTF-8"))
         con.outputStream.close();
diff --git a/test/src/test/java/hudson/ClassicPluginStrategyTest.java b/test/src/test/java/hudson/ClassicPluginStrategyTest.java
index a0cfe146de..24a3a3e788 100644
--- a/test/src/test/java/hudson/ClassicPluginStrategyTest.java
+++ b/test/src/test/java/hudson/ClassicPluginStrategyTest.java
@@ -24,12 +24,18 @@
  */
 package hudson;
 
+import hudson.model.Hudson;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.recipes.LocalData;
+import org.jvnet.hudson.test.recipes.Recipe;
 
+import java.io.File;
 import java.net.URL;
+import java.util.Collection;
 import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 /**
  * @author Alan Harder
@@ -42,6 +48,26 @@ public class ClassicPluginStrategyTest extends HudsonTestCase {
         super.setUp();
     }
 
+    @Override
+    protected Hudson newHudson() throws Exception {
+        File home = homeLoader.allocate();
+        
+        for (Recipe.Runner r : recipes) {
+            r.decorateHome(this,home);
+        }
+        LocalPluginManager pluginManager = new LocalPluginManager(home) {
+            @Override
+            protected Collection<String> loadBundledPlugins() {
+                // Overriding so we can force loading of the detached plugins for testing
+                Set<String> names = new LinkedHashSet<>();
+                names.addAll(loadPluginsFromWar("/WEB-INF/plugins"));
+                names.addAll(loadPluginsFromWar("/WEB-INF/detached-plugins"));
+                return names;
+            }
+        };
+        return new Hudson(home, createWebServer(), pluginManager);
+     }
+
     /**
      * Test finding resources via DependencyClassLoader.
      */
diff --git a/test/src/test/java/hudson/PluginManagerInstalledGUITest.java b/test/src/test/java/hudson/PluginManagerInstalledGUITest.java
index b4a23ad6bc..ae95099f8a 100644
--- a/test/src/test/java/hudson/PluginManagerInstalledGUITest.java
+++ b/test/src/test/java/hudson/PluginManagerInstalledGUITest.java
@@ -33,12 +33,13 @@ import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.recipes.WithPlugin;
+import org.jvnet.hudson.test.TestPluginManager;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -49,10 +50,28 @@ import java.util.Set;
 public class PluginManagerInstalledGUITest {
 
     @Rule
-    public JenkinsRule jenkinsRule = new JenkinsRule();
+    public JenkinsRule jenkinsRule = new JenkinsRule() {
+        @Override
+        public PluginManager getPluginManager() {
+            try {
+                return new TestPluginManager() {
+                    @Override
+                    protected Collection<String> loadBundledPlugins() throws Exception {
+                        try {
+                            return super.loadBundledPlugins();
+                        } finally {
+                            installResourcePlugin("tasks.jpi");
+                        }
+                    }
+                };
+            } catch (IOException e) {
+                Assert.fail(e.getMessage());
+                return null;
+            }
+        }
+    };
     
     @Test
-    @WithPlugin("tasks.jpi")
     public void test_enable_disable_uninstall() throws IOException, SAXException {
         InstalledPlugins installedPlugins = new InstalledPlugins();
         
diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java
index 02e3e21bd2..913e3f4a15 100644
--- a/test/src/test/java/hudson/PluginManagerTest.java
+++ b/test/src/test/java/hudson/PluginManagerTest.java
@@ -42,10 +42,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Future;
 import jenkins.RestartRequiredException;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 import org.apache.commons.io.FileUtils;
 import org.apache.tools.ant.filters.StringInputStream;
 import static org.junit.Assert.*;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -338,75 +339,6 @@ public class PluginManagerTest {
         assertTrue(r.jenkins.getExtensionList("org.jenkinsci.plugins.dependencytest.dependee.DependeeExtensionPoint").isEmpty());
     }
 
-    @Issue("JENKINS-21486")
-    @Test public void installPluginWithObsoleteDependencyFails() throws Exception {
-        // Load dependee 0.0.1.
-        {
-            dynamicLoad("dependee.hpi");
-        }
-
-        // Load mandatory-depender 0.0.2, depending on dependee 0.0.2
-        try {
-            dynamicLoad("mandatory-depender-0.0.2.hpi");
-            fail("Should not have worked");
-        } catch (IOException e) {
-            // Expected
-        }
-    }
-
-    @Issue("JENKINS-21486")
-    @Test public void installPluginWithDisabledOptionalDependencySucceeds() throws Exception {
-        // Load dependee 0.0.2.
-        {
-            dynamicLoadAndDisable("dependee-0.0.2.hpi");
-        }
-
-        // Load depender 0.0.2, depending optionally on dependee 0.0.2
-        {
-            dynamicLoad("depender-0.0.2.hpi");
-        }
-
-        // dependee is not loaded so we cannot list any extension for it.
-        try {
-            r.jenkins.getExtensionList("org.jenkinsci.plugins.dependencytest.dependee.DependeeExtensionPoint");
-            fail();
-        } catch( ClassNotFoundException _ ){
-        }
-    }
-
-    @Issue("JENKINS-21486")
-    @Test public void installPluginWithDisabledDependencyFails() throws Exception {
-        // Load dependee 0.0.2.
-        {
-            dynamicLoadAndDisable("dependee-0.0.2.hpi");
-        }
-
-        // Load mandatory-depender 0.0.2, depending on dependee 0.0.2
-        try {
-            dynamicLoad("mandatory-depender-0.0.2.hpi");
-            fail("Should not have worked");
-        } catch (IOException e) {
-            // Expected
-        }
-    }
-
-
-    @Issue("JENKINS-21486")
-    @Test public void installPluginWithObsoleteOptionalDependencyFails() throws Exception {
-        // Load dependee 0.0.1.
-        {
-            dynamicLoad("dependee.hpi");
-        }
-
-        // Load depender 0.0.2, depending optionally on dependee 0.0.2
-        try {
-            dynamicLoad("depender-0.0.2.hpi");
-            fail("Should not have worked");
-        } catch (IOException e) {
-            // Expected
-        }
-    }
-
     @Issue("JENKINS-12753")
     @WithPlugin("tasks.jpi")
     @Test public void dynamicLoadRestartRequiredException() throws Exception {
@@ -425,11 +357,24 @@ public class PluginManagerTest {
         assertEquals("should not have tried to delete & unpack", lastMod, timestamp.lastModified());
     }
 
+    @WithPlugin("tasks.jpi")
+    @Test public void pluginListJSONApi() throws IOException {
+        JSONObject response = r.getJSON("pluginManager/plugins").getJSONObject();
+
+        // Check that the basic API endpoint invocation works.
+        assertEquals("ok", response.getString("status"));
+        JSONArray data = response.getJSONArray("data");
+        assertTrue(data.size() > 0);
+
+        // Check that there was some data in the response and that the first entry
+        // at least had some of the expected fields.
+        JSONObject pluginInfo = data.getJSONObject(0);
+        assertTrue(pluginInfo.getString("name") != null);
+        assertTrue(pluginInfo.getString("title") != null);
+        assertTrue(pluginInfo.getString("dependencies") != null);
+    }
+
     private void dynamicLoad(String plugin) throws IOException, InterruptedException, RestartRequiredException {
         PluginManagerUtil.dynamicLoad(plugin, r.jenkins);
     }
-
-    private void dynamicLoadAndDisable(String plugin) throws IOException, InterruptedException, RestartRequiredException {
-        PluginManagerUtil.dynamicLoad(plugin, r.jenkins, true);
-    }
 }
diff --git a/test/src/test/java/hudson/PluginManagerTest2.java b/test/src/test/java/hudson/PluginManagerTest2.java
index e51e4484db..f889130cb4 100644
--- a/test/src/test/java/hudson/PluginManagerTest2.java
+++ b/test/src/test/java/hudson/PluginManagerTest2.java
@@ -7,7 +7,6 @@ import java.net.URL;
 import javax.servlet.ServletContext;
 
 import org.jvnet.hudson.test.HudsonTestCase;
-import org.jvnet.hudson.test.recipes.WithPlugin;
 import org.xml.sax.SAXException;
 
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
@@ -29,21 +28,6 @@ public class PluginManagerTest2 extends HudsonTestCase {
         return servletContext;
     }
 
-    @WithPlugin("tasks.jpi")
-    public void testPinned() throws Exception {
-        PluginWrapper tasks = jenkins.getPluginManager().getPlugin("tasks");
-        assertFalse("tasks shouldn't be bundled",tasks.isBundled());
-        assertFalse("tasks shouldn't be pinned before update",tasks.isPinned());
-        uploadPlugin("tasks.jpi", false);
-        assertFalse("tasks shouldn't be pinned after update",tasks.isPinned());
-
-        PluginWrapper cvs = jenkins.getPluginManager().getPlugin("cvs");
-        assertTrue("cvs should be bundled",cvs.isBundled());
-        assertFalse("cvs shouldn't be pinned before update",cvs.isPinned());
-        uploadPlugin("cvs.hpi", true);
-        assertTrue("cvs should be pinned after update",cvs.isPinned());
-    }
-
     private void uploadPlugin(String pluginName, boolean useServerRoot) throws IOException, SAXException, Exception {
         HtmlPage page = new WebClient().goTo("pluginManager/advanced");
         HtmlForm f = page.getFormByName("uploadPlugin");
diff --git a/test/src/test/java/hudson/PluginManagerUtil.java b/test/src/test/java/hudson/PluginManagerUtil.java
index 2263622b4c..e67b9b31f9 100644
--- a/test/src/test/java/hudson/PluginManagerUtil.java
+++ b/test/src/test/java/hudson/PluginManagerUtil.java
@@ -48,16 +48,9 @@ public class PluginManagerUtil {
     }
 
     public static void dynamicLoad(String plugin, Jenkins jenkins) throws IOException, InterruptedException, RestartRequiredException {
-        dynamicLoad(plugin, jenkins, false);
-    }
-
-    public static void dynamicLoad(String plugin, Jenkins jenkins, boolean disable) throws IOException, InterruptedException, RestartRequiredException {
         URL src = PluginManagerTest.class.getClassLoader().getResource("plugins/" + plugin);
         File dest = new File(jenkins.getRootDir(), "plugins/" + plugin);
         FileUtils.copyURLToFile(src, dest);
-        if (disable) {
-            new File(dest.getPath() + ".disabled").createNewFile();
-        }
         jenkins.pluginManager.dynamicLoad(dest);
     }
 }
diff --git a/test/src/test/java/hudson/PluginWrapperTest.java b/test/src/test/java/hudson/PluginWrapperTest.java
deleted file mode 100644
index 7529c53194..0000000000
--- a/test/src/test/java/hudson/PluginWrapperTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package hudson;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class PluginWrapperTest {
-
-    @Test
-    public void dependencyTest() {
-        String version = "plugin:0.0.2";
-        PluginWrapper.Dependency dependency = new PluginWrapper.Dependency(version);
-        assertEquals("plugin", dependency.shortName);
-        assertEquals("0.0.2", dependency.version);
-        assertEquals(false, dependency.optional);
-    }
-
-    @Test
-    public void optionalDependencyTest() {
-        String version = "plugin:0.0.2;resolution:=optional";
-        PluginWrapper.Dependency dependency = new PluginWrapper.Dependency(version);
-        assertEquals("plugin", dependency.shortName);
-        assertEquals("0.0.2", dependency.version);
-        assertEquals(true, dependency.optional);
-    }
-}
diff --git a/test/src/test/java/hudson/cli/CreateNodeCommandTest.java b/test/src/test/java/hudson/cli/CreateNodeCommandTest.java
index 0cb5dfc6fc..329e2d4b91 100644
--- a/test/src/test/java/hudson/cli/CreateNodeCommandTest.java
+++ b/test/src/test/java/hudson/cli/CreateNodeCommandTest.java
@@ -60,7 +60,7 @@ public class CreateNodeCommandTest {
                 .invoke()
         ;
 
-        assertThat(result.stderr(), containsString("ERROR: user is missing the Slave/Create permission"));
+        assertThat(result.stderr(), containsString("ERROR: user is missing the Agent/Create permission"));
         assertThat(result, hasNoStandardOutput());
         assertThat(result, failedWith(6));
     }
diff --git a/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java b/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java
index 9db0e60419..07ddcdca2a 100644
--- a/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java
+++ b/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java
@@ -62,7 +62,7 @@ public class DeleteNodeCommandTest {
 
         assertThat(result, failedWith(6));
         assertThat(result, hasNoStandardOutput());
-        assertThat(result.stderr(), containsString("ERROR: user is missing the Slave/Delete permission"));
+        assertThat(result.stderr(), containsString("ERROR: user is missing the Agent/Delete permission"));
     }
 
     @Test public void deleteNodeShouldSucceed() throws Exception {
diff --git a/test/src/test/java/hudson/cli/GetNodeCommandTest.java b/test/src/test/java/hudson/cli/GetNodeCommandTest.java
index eb20a1162c..b6f7c575da 100644
--- a/test/src/test/java/hudson/cli/GetNodeCommandTest.java
+++ b/test/src/test/java/hudson/cli/GetNodeCommandTest.java
@@ -59,7 +59,7 @@ public class GetNodeCommandTest {
                 .invokeWithArgs("MySlave")
         ;
 
-        assertThat(result.stderr(), containsString("ERROR: user is missing the Slave/ExtendedRead permission"));
+        assertThat(result.stderr(), containsString("ERROR: user is missing the Agent/ExtendedRead permission"));
         assertThat(result, failedWith(6));
         assertThat(result, hasNoStandardOutput());
     }
diff --git a/test/src/test/java/hudson/cli/GroovyshCommandTest.java b/test/src/test/java/hudson/cli/GroovyshCommandTest.java
index 8c7d1a4066..eb61043593 100644
--- a/test/src/test/java/hudson/cli/GroovyshCommandTest.java
+++ b/test/src/test/java/hudson/cli/GroovyshCommandTest.java
@@ -42,7 +42,7 @@ public class GroovyshCommandTest {
     @Test public void authentication() throws Exception {
         CLICommandInvoker.Result result = new CLICommandInvoker(r, new GroovyshCommand())
             .authorizedTo(Jenkins.READ, Jenkins.RUN_SCRIPTS)
-            .withStdin(new StringInputStream("println(jenkins.model.Jenkins.instance.getClass().name)\nquit\n"))
+            .withStdin(new StringInputStream("println(jenkins.model.Jenkins.instance.getClass().name)\n:quit\n"))
             .invoke();
         assertThat(result, succeeded());
         assertThat(result, hasNoErrorOutput());
diff --git a/test/src/test/java/hudson/cli/HelpCommandTest.java b/test/src/test/java/hudson/cli/HelpCommandTest.java
index 566ea169e4..26c2da6ccd 100644
--- a/test/src/test/java/hudson/cli/HelpCommandTest.java
+++ b/test/src/test/java/hudson/cli/HelpCommandTest.java
@@ -101,7 +101,7 @@ public class HelpCommandTest {
 
     private void assertContainsUsageOfMethodCommand(String text) {
         assertThat(text, containsString("offline-node NAME [-m VAL]"));
-        assertThat(text, containsStrings("NAME", "Slave name, or empty string for master"));
+        assertThat(text, containsStrings("NAME", "Agent name, or empty string for master"));
         assertThat(text, containsStrings("-m VAL", "Record the note about why you are disconnecting this node"));
     }
 
diff --git a/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java b/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java
index 686cb2d64d..620429120c 100644
--- a/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java
+++ b/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java
@@ -65,7 +65,7 @@ public class OnlineNodeCommandTest {
 
         assertThat(result, failedWith(6));
         assertThat(result, hasNoStandardOutput());
-        assertThat(result.stderr(), containsString("ERROR: user is missing the Slave/Connect permission"));
+        assertThat(result.stderr(), containsString("ERROR: user is missing the Agent/Connect permission"));
     }
 
     @Test public void onlineNodeShouldFailIfNodeDoesNotExist() throws Exception {
@@ -74,7 +74,7 @@ public class OnlineNodeCommandTest {
                 .invokeWithArgs("never_created");
         assertThat(result, failedWith(3));
         assertThat(result, hasNoStandardOutput());
-        assertThat(result.stderr(), containsString("ERROR: No such slave \"never_created\" exists."));
+        assertThat(result.stderr(), containsString("ERROR: No such agent \"never_created\" exists."));
 
     }
 
diff --git a/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java b/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
index cac9dda8ab..f03b7d2a5f 100644
--- a/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
+++ b/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
@@ -60,7 +60,7 @@ public class UpdateNodeCommandTest {
                 .invokeWithArgs("MySlave")
         ;
 
-        assertThat(result.stderr(), containsString("ERROR: user is missing the Slave/Configure permission"));
+        assertThat(result.stderr(), containsString("ERROR: user is missing the Agent/Configure permission"));
         assertThat(result, failedWith(6));
         assertThat(result, hasNoStandardOutput());
     }
diff --git a/test/src/test/java/hudson/jobs/CreateItemTest.java b/test/src/test/java/hudson/jobs/CreateItemTest.java
index ec0eef98d4..1e374bda55 100644
--- a/test/src/test/java/hudson/jobs/CreateItemTest.java
+++ b/test/src/test/java/hudson/jobs/CreateItemTest.java
@@ -23,7 +23,7 @@
  */
 package hudson.jobs;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.net.URL;
 import java.text.MessageFormat;
@@ -37,6 +37,8 @@ import org.jvnet.hudson.test.JenkinsRule;
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.WebRequest;
+import hudson.model.FreeStyleProject;
+import org.jvnet.hudson.test.MockFolder;
 
 /**
  * Tests the /createItem REST API.
@@ -82,4 +84,16 @@ public class CreateItemTest {
     private void deleteContentTypeHeader(WebRequest request) {
         request.setEncodingType(null);
     }
+
+    @Test
+    public void createWithFolderPaths() throws Exception {
+        rule.jenkins.setCrumbIssuer(null);
+        rule.createFolder("d1").createProject(FreeStyleProject.class, "p");
+        MockFolder d2 = rule.createFolder("d2");
+        rule.createWebClient().getPage(new WebRequest(new URL(d2.getAbsoluteUrl() + "createItem?mode=copy&name=p2&from=../d1/p"), HttpMethod.POST));
+        assertNotNull(d2.getItem("p2"));
+        rule.createWebClient().getPage(new WebRequest(new URL(d2.getAbsoluteUrl() + "createItem?mode=copy&name=p3&from=/d1/p"), HttpMethod.POST));
+        assertNotNull(d2.getItem("p3"));
+    }
+
 }
diff --git a/test/src/test/java/hudson/model/ComputerTest.java b/test/src/test/java/hudson/model/ComputerTest.java
index 8b6efad413..abc6c333cb 100644
--- a/test/src/test/java/hudson/model/ComputerTest.java
+++ b/test/src/test/java/hudson/model/ComputerTest.java
@@ -84,7 +84,7 @@ public class ComputerTest {
         } catch (FailingHttpStatusCodeException e) {
             assertThat(NOTE, e.getStatusCode(), equalTo(400));
             assertThat(NOTE, e.getResponse().getContentAsString(),
-                    containsString("Slave called ‘nodeA’ already exists"));
+                    containsString("Agent called ‘nodeA’ already exists"));
         }
     }
 }
diff --git a/test/src/test/java/hudson/model/ExecutorTest.java b/test/src/test/java/hudson/model/ExecutorTest.java
index 25da5ebaea..5d5b034fcc 100644
--- a/test/src/test/java/hudson/model/ExecutorTest.java
+++ b/test/src/test/java/hudson/model/ExecutorTest.java
@@ -140,7 +140,7 @@ public class ExecutorTest {
         assertEquals(b.getResult(), Result.FAILURE);
         assertThat(log, containsString("Finished: FAILURE"));
         assertThat(log, containsString("Build step 'BlockingBuilder' marked build as failure"));
-        assertThat(log, containsString("Slave went offline during the build"));
+        assertThat(log, containsString("Agent went offline during the build"));
         assertThat(log, containsString("Disconnected by Johnny : Taking offline to break your buil"));
     }
 
diff --git a/test/src/test/java/hudson/model/HelpLinkTest.java b/test/src/test/java/hudson/model/HelpLinkTest.java
index 9fbc06a31a..65b35fc3af 100644
--- a/test/src/test/java/hudson/model/HelpLinkTest.java
+++ b/test/src/test/java/hudson/model/HelpLinkTest.java
@@ -7,6 +7,7 @@ import com.gargoylesoftware.htmlunit.html.DomNodeUtil;
 import com.gargoylesoftware.htmlunit.html.HtmlElementUtil;
 import hudson.tasks.BuildStepMonitor;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -26,6 +27,45 @@ import org.jvnet.hudson.test.JenkinsRule;
  *
  * @author Kohsuke Kawaguchi
  */
+@Ignore
+/*
+    Excluding test to be able to ship 2.0 beta 1
+    Jenkins confirms that this test is now taking 45mins to complete.
+
+    The problem appears to be the following. When a help link is clicked, the execution hangs at the following point:
+
+    "Executing negative(hudson.model.HelpLinkTest)@1" prio=5 tid=0x1 nid=NA waiting
+      java.lang.Thread.State: WAITING
+    	  at java.lang.Object.wait(Object.java:-1)
+    	  at com.gargoylesoftware.htmlunit.javascript.background.JavaScriptJobManagerImpl.waitForJobs(JavaScriptJobManagerImpl.java:200)
+    	  at com.gargoylesoftware.htmlunit.WebClient.waitForBackgroundJavaScript(WebClient.java:1843)
+    	  at com.gargoylesoftware.htmlunit.WebClientUtil.waitForJSExec(WebClientUtil.java:57)
+    	  at com.gargoylesoftware.htmlunit.WebClientUtil.waitForJSExec(WebClientUtil.java:46)
+    	  at com.gargoylesoftware.htmlunit.html.HtmlElementUtil.click(HtmlElementUtil.java:61)
+    	  at hudson.model.HelpLinkTest.clickAllHelpLinks(HelpLinkTest.java:70)
+    	  at hudson.model.HelpLinkTest.clickAllHelpLinks(HelpLinkTest.java:61)
+    	  at hudson.model.HelpLinkTest.negative(HelpLinkTest.java:106)
+
+    In debugger, I can see that JavaScriptJobManagerImpl.waitForJobs is looping through yet each time getJobCount()>0
+    because there's always some window.setTimeout activities that appear to be scheduled. Common ones are:
+
+        window.setTimeout(  function () {
+              thisConfig.trackSectionVisibility();
+          }, 500)
+
+        window.setTimeout(  function () {
+              return __method.apply(__method, args);
+          }, 10)
+
+        window.setTimeout(  function () {
+              oSelf._printBuffer();
+          }, 100)
+
+    getJobCount() never appears to return 0, so the method blocks until the time out of 10 secs is reached.
+    Multiply that by 50 or so help links to click and now you see why each test takes 10mins.
+
+    Maybe this is related to the scrollspy changes?
+ */
 public class HelpLinkTest {
 
     @Rule
diff --git a/test/src/test/java/hudson/model/HudsonTest.java b/test/src/test/java/hudson/model/HudsonTest.java
index 97e3576b14..0d2f037f30 100644
--- a/test/src/test/java/hudson/model/HudsonTest.java
+++ b/test/src/test/java/hudson/model/HudsonTest.java
@@ -89,6 +89,10 @@ public class HudsonTest {
         HtmlPage configPage = j.createWebClient().goTo("configure");
         HtmlForm form = configPage.getFormByName("config");
         j.submit(form);
+        // Load tools page and resubmit too
+        HtmlPage toolsConfigPage = j.createWebClient().goTo("configureTools");
+        HtmlForm toolsForm = toolsConfigPage.getFormByName("config");
+        j.submit(toolsForm);
 
         // make sure all the pieces are intact
         assertEquals(2, j.jenkins.getNumExecutors());
diff --git a/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java b/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java
new file mode 100644
index 0000000000..0a1113e9d9
--- /dev/null
+++ b/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java
@@ -0,0 +1,161 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.model;
+
+import net.sf.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+
+import static hudson.model.UpdateCenter.ConnectionStatus;
+
+/**
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ */
+public class UpdateCenterConnectionStatusTest {
+
+    @Rule
+    public JenkinsRule jenkinsRule = new JenkinsRule();
+
+
+    @Test
+    public void doConnectionStatus_default_site() throws IOException, SAXException {
+        JSONObject response = jenkinsRule.getJSON("updateCenter/connectionStatus").getJSONObject();
+
+        Assert.assertEquals("ok", response.getString("status"));
+        JSONObject statusObj = response.getJSONObject("data");
+        Assert.assertTrue(statusObj.has("updatesite"));
+        Assert.assertTrue(statusObj.has("internet"));
+
+        // The following is equivalent to the above
+        response = jenkinsRule.getJSON("updateCenter/connectionStatus?siteId=default").getJSONObject();
+
+        Assert.assertEquals("ok", response.getString("status"));
+        statusObj = response.getJSONObject("data");
+        Assert.assertTrue(statusObj.has("updatesite"));
+        Assert.assertTrue(statusObj.has("internet"));
+    }
+
+    @Test
+    public void doConnectionStatus_unknown_site() throws IOException, SAXException {
+        JSONObject response = jenkinsRule.getJSON("updateCenter/connectionStatus?siteId=blahblah").getJSONObject();
+
+        Assert.assertEquals("error", response.getString("status"));
+        Assert.assertEquals("Unknown site 'blahblah'.", response.getString("message"));
+    }
+
+    private UpdateSite updateSite = new UpdateSite(UpdateCenter.ID_DEFAULT, "http://xyz") {
+        @Override
+        public String getConnectionCheckUrl() {
+            return "http://xyz./";
+        }
+    };
+
+    @Test
+    public void test_states_allok() {
+        UpdateCenter updateCenter = new UpdateCenter(new TestConfig());
+        UpdateCenter.ConnectionCheckJob job = updateCenter.newConnectionCheckJob(updateSite);
+
+        Assert.assertEquals(ConnectionStatus.PRECHECK, job.connectionStates.get(ConnectionStatus.INTERNET));
+        Assert.assertEquals(ConnectionStatus.PRECHECK, job.connectionStates.get(ConnectionStatus.UPDATE_SITE));
+
+        job.run();
+
+        Assert.assertEquals(ConnectionStatus.OK, job.connectionStates.get(ConnectionStatus.INTERNET));
+        Assert.assertEquals(ConnectionStatus.OK, job.connectionStates.get(ConnectionStatus.UPDATE_SITE));
+    }
+
+    @Test
+    public void test_states_internet_failed() {
+        UpdateCenter updateCenter = new UpdateCenter(new TestConfig().failInternet());
+        UpdateCenter.ConnectionCheckJob job = updateCenter.newConnectionCheckJob(updateSite);
+
+        job.run();
+
+        Assert.assertEquals(ConnectionStatus.FAILED, job.connectionStates.get(ConnectionStatus.INTERNET));
+        Assert.assertEquals(ConnectionStatus.OK, job.connectionStates.get(ConnectionStatus.UPDATE_SITE));
+    }
+
+    @Test
+    public void test_states_uc_failed_timeout() {
+        UpdateCenter updateCenter = new UpdateCenter(new TestConfig().failUCConnect());
+        UpdateCenter.ConnectionCheckJob job = updateCenter.newConnectionCheckJob(updateSite);
+
+        job.run();
+
+        Assert.assertEquals(ConnectionStatus.OK, job.connectionStates.get(ConnectionStatus.INTERNET));
+        Assert.assertEquals(ConnectionStatus.FAILED, job.connectionStates.get(ConnectionStatus.UPDATE_SITE));
+    }
+
+    @Test
+    public void test_states_uc_failed_UnknownHost() {
+        UpdateCenter updateCenter = new UpdateCenter(new TestConfig().failUCResolve());
+        UpdateCenter.ConnectionCheckJob job = updateCenter.newConnectionCheckJob(updateSite);
+
+        job.run();
+
+        Assert.assertEquals(ConnectionStatus.OK, job.connectionStates.get(ConnectionStatus.INTERNET));
+        Assert.assertEquals(ConnectionStatus.FAILED, job.connectionStates.get(ConnectionStatus.UPDATE_SITE));
+    }
+
+    private class TestConfig extends UpdateCenter.UpdateCenterConfiguration {
+
+        private IOException checkConnectionException;
+        private IOException checkUpdateCenterException;
+
+        private TestConfig failInternet() {
+            checkConnectionException = new IOException("Connection timed out");
+            return this;
+        }
+
+        private TestConfig failUCResolve() {
+            checkUpdateCenterException = new UnknownHostException("Unable to resolve UpdateCenter host address.");
+            return this;
+        }
+
+        private TestConfig failUCConnect() {
+            checkUpdateCenterException = new IOException("Connection timed out");
+            return this;
+        }
+
+        @Override
+        public void checkConnection(UpdateCenter.ConnectionCheckJob job, String connectionCheckUrl) throws IOException {
+            if (checkConnectionException != null) {
+                throw checkConnectionException;
+            }
+        }
+
+        @Override
+        public void checkUpdateCenter(UpdateCenter.ConnectionCheckJob job, String updateCenterUrl) throws IOException {
+            if (checkUpdateCenterException != null) {
+                throw checkUpdateCenterException;
+            }
+        }
+    }
+}
diff --git a/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java b/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java
new file mode 100644
index 0000000000..fe651a8263
--- /dev/null
+++ b/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java
@@ -0,0 +1,94 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.model;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.Arrays;
+
+/**
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ */
+public class UpdateCenterPluginInstallTest {
+
+    @Rule
+    public JenkinsRule jenkinsRule = new JenkinsRule();
+
+    public void setup() throws IOException {
+        jenkinsRule.jenkins.getUpdateCenter().getSite(UpdateCenter.ID_DEFAULT).updateDirectlyNow(false);
+        InetSocketAddress address = new InetSocketAddress("updates.jenkins-ci.org", 80);
+        Assume.assumeFalse("Unable to resolve updates.jenkins-ci.org. Skip test.", address.isUnresolved());
+    }
+
+    @Test
+    public void test_installUnknownPlugin() throws IOException, SAXException {
+        setup();
+        JenkinsRule.JSONWebResponse response = jenkinsRule.postJSON("pluginManager/installPlugins", buildInstallPayload("unknown_plugin_xyz"));
+        JSONObject json = response.getJSONObject();
+
+        Assert.assertEquals("error", json.get("status"));
+        Assert.assertEquals("No such plugin: unknown_plugin_xyz", json.get("message"));
+        Assert.assertEquals("error", json.get("status"));
+        Assert.assertEquals("No such plugin: unknown_plugin_xyz", json.get("message"));
+    }
+
+    @Test
+    public void test_installKnownPlugins() throws IOException, SAXException {
+        setup();
+        JenkinsRule.JSONWebResponse installResponse = jenkinsRule.postJSON("pluginManager/installPlugins", buildInstallPayload("changelog-history", "git"));
+        JSONObject json = installResponse.getJSONObject();
+
+        Assert.assertEquals("ok", json.get("status"));
+        JSONObject data = json.getJSONObject("data");
+        Assert.assertTrue(data.has("correlationId"));
+
+        String correlationId = data.getString("correlationId");
+        JSONObject installStatus = jenkinsRule.getJSON("updateCenter/installStatus?correlationId=" + correlationId).getJSONObject();
+        Assert.assertEquals("ok", json.get("status"));
+        JSONObject status = installStatus.getJSONObject("data");
+        JSONArray states = status.getJSONArray("jobs");
+        Assert.assertEquals(2, states.size());
+
+        JSONObject pluginInstallState = states.getJSONObject(0);
+        Assert.assertEquals("changelog-history", pluginInstallState.get("name"));
+        pluginInstallState = states.getJSONObject(1);
+        Assert.assertEquals("git", pluginInstallState.get("name"));
+    }
+
+    private JSONObject buildInstallPayload(String... plugins) {
+        JSONObject payload = new JSONObject();
+        payload.put("dynamicLoad", true);
+        payload.put("plugins", JSONArray.fromObject(Arrays.asList(plugins)));
+        return payload;
+    }
+}
diff --git a/test/src/test/java/hudson/model/ViewDescriptorTest.java b/test/src/test/java/hudson/model/ViewDescriptorTest.java
new file mode 100644
index 0000000000..02be6a5f4b
--- /dev/null
+++ b/test/src/test/java/hudson/model/ViewDescriptorTest.java
@@ -0,0 +1,78 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2016 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.model;
+
+import java.util.Arrays;
+import java.util.TreeSet;
+import jenkins.model.DirectlyModifiableTopLevelItemGroup;
+import static org.junit.Assert.*;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.MockFolder;
+import org.jvnet.hudson.test.TestExtension;
+
+public class ViewDescriptorTest {
+
+    @Rule
+    public JenkinsRule r = new JenkinsRule();
+
+    /** Checks that {@link ViewDescriptor#doAutoCompleteCopyNewItemFrom} honors {@link DirectlyModifiableTopLevelItemGroup#canAdd}. */
+    @Test
+    public void canAdd() throws Exception {
+        MockFolder d1 = r.createFolder("d1");
+        d1.createProject(MockFolder.class, "sub");
+        d1.createProject(FreeStyleProject.class, "prj");
+        MockFolder d2 = r.jenkins.createProject(RestrictiveFolder.class, "d2");
+        assertContains(r.jenkins.getDescriptorByType(AllView.DescriptorImpl.class).doAutoCompleteCopyNewItemFrom("../d1/", d2), "../d1/prj");
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"}) // the usual API mistakes
+    public static class RestrictiveFolder extends MockFolder {
+
+        public RestrictiveFolder(ItemGroup parent, String name) {
+            super(parent, name);
+        }
+
+        @Override
+        public boolean canAdd(TopLevelItem item) {
+            return item instanceof FreeStyleProject;
+        }
+
+        @TestExtension("canAdd") public static class DescriptorImpl extends TopLevelItemDescriptor {
+
+            @Override public TopLevelItem newInstance(ItemGroup parent, String name) {
+                return new RestrictiveFolder(parent, name);
+            }
+
+        }
+
+    }
+
+    private void assertContains(AutoCompletionCandidates c, String... values) {
+        assertEquals(new TreeSet<>(Arrays.asList(values)), new TreeSet<>(c.getValues()));
+    }
+
+}
diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java
index 67e1c2a019..36841da295 100644
--- a/test/src/test/java/hudson/model/ViewTest.java
+++ b/test/src/test/java/hudson/model/ViewTest.java
@@ -45,17 +45,24 @@ import org.jvnet.hudson.test.Email;
 import org.w3c.dom.Text;
 
 import static hudson.model.Messages.Hudson_ViewName;
+import hudson.security.ACL;
+import hudson.security.AccessDeniedException2;
 import hudson.slaves.DumbSlave;
+import hudson.util.FormValidation;
 import hudson.util.HudsonIsLoading;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
+import jenkins.model.ProjectNamingStrategy;
+import jenkins.security.NotReallyRoleSensitiveCallable;
 import static org.junit.Assert.*;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.JenkinsRule.WebClient;
+import org.jvnet.hudson.test.MockAuthorizationStrategy;
+import org.jvnet.hudson.test.MockFolder;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -428,4 +435,75 @@ public class ViewTest {
             }
         }
     }
+
+    @Issue("JENKINS-20509")
+    @Test public void checkJobName() throws Exception {
+        j.createFreeStyleProject("topprj");
+        final MockFolder d1 = j.createFolder("d1");
+        d1.createProject(FreeStyleProject.class, "subprj");
+        final MockFolder d2 = j.createFolder("d2");
+        j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
+        j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy().
+            grant(Jenkins.ADMINISTER).everywhere().to("admin").
+            grant(Jenkins.READ).everywhere().toEveryone().
+            grant(Job.READ).everywhere().toEveryone().
+            grant(Item.CREATE).onFolders(d1).to("dev")); // not on root or d2
+        ACL.impersonate(Jenkins.ANONYMOUS, new NotReallyRoleSensitiveCallable<Void,Exception>() {
+            @Override
+            public Void call() throws Exception {
+                try {
+                    assertCheckJobName(j.jenkins, "whatever", FormValidation.Kind.OK);
+                    fail("should not have been allowed");
+                } catch (AccessDeniedException2 x) {
+                    // OK
+                }
+                return null;
+            }
+        });
+        ACL.impersonate(User.get("dev").impersonate(), new NotReallyRoleSensitiveCallable<Void,Exception>() {
+            @Override
+            public Void call() throws Exception {
+                try {
+                    assertCheckJobName(j.jenkins, "whatever", FormValidation.Kind.OK);
+                    fail("should not have been allowed");
+                } catch (AccessDeniedException2 x) {
+                    // OK
+                }
+                try {
+                    assertCheckJobName(d2, "whatever", FormValidation.Kind.OK);
+                    fail("should not have been allowed");
+                } catch (AccessDeniedException2 x) {
+                    // OK
+                }
+                assertCheckJobName(d1, "whatever", FormValidation.Kind.OK);
+                return null;
+            }
+        });
+        ACL.impersonate(User.get("admin").impersonate(), new NotReallyRoleSensitiveCallable<Void,Exception>() {
+            @Override
+            public Void call() throws Exception {
+                assertCheckJobName(j.jenkins, "whatever", FormValidation.Kind.OK);
+                assertCheckJobName(d1, "whatever", FormValidation.Kind.OK);
+                assertCheckJobName(d2, "whatever", FormValidation.Kind.OK);
+                assertCheckJobName(j.jenkins, "d1", FormValidation.Kind.ERROR);
+                assertCheckJobName(j.jenkins, "topprj", FormValidation.Kind.ERROR);
+                assertCheckJobName(d1, "subprj", FormValidation.Kind.ERROR);
+                assertCheckJobName(j.jenkins, "", FormValidation.Kind.OK);
+                assertCheckJobName(j.jenkins, "foo/bie", FormValidation.Kind.ERROR);
+                assertCheckJobName(d2, "New", FormValidation.Kind.OK);
+                j.jenkins.setProjectNamingStrategy(new ProjectNamingStrategy.PatternProjectNamingStrategy("[a-z]+", "", true));
+                assertCheckJobName(d2, "New", FormValidation.Kind.ERROR);
+                assertCheckJobName(d2, "new", FormValidation.Kind.OK);
+                return null;
+            }
+        });
+        JenkinsRule.WebClient wc = j.createWebClient().login("admin");
+        assertEquals("original ${rootURL}/checkJobName still supported", "<div/>", wc.goTo("checkJobName?value=stuff").getWebResponse().getContentAsString());
+        assertEquals("but now possible on a view in a folder", "<div/>", wc.goTo("job/d1/view/All/checkJobName?value=stuff").getWebResponse().getContentAsString());
+    }
+
+    private void assertCheckJobName(ViewGroup context, String name, FormValidation.Kind expected) {
+        assertEquals(expected, context.getPrimaryView().doCheckJobName(name).kind);
+    }
+
 }
diff --git a/test/src/test/java/hudson/tasks/MavenTest.java b/test/src/test/java/hudson/tasks/MavenTest.java
index a95a2285de..5d50ec0c60 100644
--- a/test/src/test/java/hudson/tasks/MavenTest.java
+++ b/test/src/test/java/hudson/tasks/MavenTest.java
@@ -159,7 +159,7 @@ public class MavenTest {
      * Simulates the addition of the new Maven via UI and makes sure it works.
      */
     @Test public void globalConfigAjax() throws Exception {
-        HtmlPage p = j.createWebClient().goTo("configure");
+        HtmlPage p = j.createWebClient().goTo("configureTools");
         HtmlForm f = p.getFormByName("config");
         HtmlButton b = j.getButtonByCaption(f, "Add Maven");
         b.click();
diff --git a/test/src/test/java/hudson/tools/JDKInstallerTest.java b/test/src/test/java/hudson/tools/JDKInstallerTest.java
index c91f1cc112..e9ced11efe 100644
--- a/test/src/test/java/hudson/tools/JDKInstallerTest.java
+++ b/test/src/test/java/hudson/tools/JDKInstallerTest.java
@@ -94,7 +94,7 @@ public class JDKInstallerTest {
         j.jenkins.getJDKs().add(new JDK("test",tmp.getRoot().getAbsolutePath(), Arrays.asList(
                 new InstallSourceProperty(Arrays.<ToolInstaller>asList(installer)))));
 
-        j.submit(j.createWebClient().goTo("configure").getFormByName("config"));
+        j.submit(j.createWebClient().goTo("configureTools").getFormByName("config"));
 
         JDK jdk = j.jenkins.getJDK("test");
         InstallSourceProperty isp = jdk.getProperties().get(InstallSourceProperty.class);
diff --git a/test/src/test/java/jenkins/I18nTest.java b/test/src/test/java/jenkins/I18nTest.java
new file mode 100644
index 0000000000..a934422532
--- /dev/null
+++ b/test/src/test/java/jenkins/I18nTest.java
@@ -0,0 +1,64 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins;
+
+import net.sf.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ */
+public class I18nTest {
+
+    @Rule
+    public JenkinsRule jenkinsRule = new JenkinsRule();
+
+    @Test
+    public void test_baseName_unspecified() throws IOException, SAXException {
+        JSONObject response = jenkinsRule.getJSON("i18n/resourceBundle").getJSONObject();
+        Assert.assertEquals("error", response.getString("status"));
+        Assert.assertEquals("Mandatory parameter 'baseName' not specified.", response.getString("message"));
+    }
+
+    @Test
+    public void test_baseName_unknown() throws IOException, SAXException {
+        JSONObject response = jenkinsRule.getJSON("i18n/resourceBundle?baseName=com.acme.XyzWhatever").getJSONObject();
+        Assert.assertEquals("error", response.getString("status"));
+        Assert.assertTrue(response.getString("message").contains("com.acme.XyzWhatever"));
+    }
+
+    @Test
+    public void test_valid() throws IOException, SAXException {
+        JSONObject response = jenkinsRule.getJSON("i18n/resourceBundle?baseName=hudson.logging.Messages&language=de").getJSONObject();
+        Assert.assertEquals("ok", response.getString("status"));
+        JSONObject data = response.getJSONObject("data");
+        Assert.assertEquals("Initialisiere Log-Rekorder", data.getString("LogRecorderManager.init"));
+    }
+}
diff --git a/test/src/test/java/jenkins/install/InstallUtilTest.java b/test/src/test/java/jenkins/install/InstallUtilTest.java
new file mode 100644
index 0000000000..e890054931
--- /dev/null
+++ b/test/src/test/java/jenkins/install/InstallUtilTest.java
@@ -0,0 +1,201 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins.install;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.mockito.Mockito;
+
+import hudson.Main;
+import hudson.model.UpdateCenter;
+import hudson.model.UpdateCenter.DownloadJob.Failure;
+import hudson.model.UpdateCenter.DownloadJob.InstallationStatus;
+import hudson.model.UpdateCenter.DownloadJob.Installing;
+import hudson.model.UpdateCenter.DownloadJob.Pending;
+import hudson.model.UpdateCenter.DownloadJob.Success;
+import hudson.model.UpdateCenter.UpdateCenterJob;
+import hudson.model.UpdateSite;
+import jenkins.model.Jenkins;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+/**
+ * Test
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
+ */
+public class InstallUtilTest {
+
+    @Rule
+    public JenkinsRule jenkinsRule = new JenkinsRule();
+
+    @Before
+    public void setup() {
+        // JenkinsRule will have created the last exec file (indirectly),
+        // so remove it so we can fake the tests.
+        InstallUtil.getLastExecVersionFile().delete();
+        // Disable the unit test flag.
+        Main.isUnitTest = false;
+    }
+
+    @After
+    public void tearDown() {
+        // Reset the unit test flag back to its default.
+        Main.isUnitTest = true;
+    }
+
+    /**
+     * Test jenkins startup sequences and the changes to the startup type..
+     */
+    @Test
+    public void test_typeTransitions() {
+        // A new test instance
+        Assert.assertEquals(InstallState.NEW, InstallUtil.getInstallState());
+
+        // Save the last exec version. This will only be done by Jenkins after one of:
+        //   1. A successful run of the install wizard.
+        //   2. A success upgrade.
+        //   3. A successful restart.
+        InstallUtil.saveLastExecVersion();
+
+        // Fudge things a little now, pretending there's a restart...
+
+        // Now if we ask what is the InstallState, we should be told it's a RESTART because
+        // the install wizard is complete and the version matches the currently executing
+        // Jenkins version.
+        Assert.assertEquals(InstallState.RESTART, InstallUtil.getInstallState());
+
+        // Fudge things again, changing the stored version to something old, faking an upgrade...
+        InstallUtil.saveLastExecVersion("1.584");
+        Assert.assertEquals(InstallState.UPGRADE, InstallUtil.getInstallState());
+
+        // Fudge things yet again, changing the stored version to something very very new, faking a downgrade...
+        InstallUtil.saveLastExecVersion("1000.0");
+        Assert.assertEquals(InstallState.DOWNGRADE, InstallUtil.getInstallState());
+    }
+
+
+    /**
+     * Test jenkins startup sequences and the changes to the startup type..
+     */
+    @Test
+    public void test_getLastExecVersion() throws Exception {
+        // Delete the config file, forcing getLastExecVersion to return
+        // the default/unset version value.
+        InstallUtil.getConfigFile().delete();
+        Assert.assertEquals("1.0", InstallUtil.getLastExecVersion());
+
+        // Set the version to some stupid value and check again. This time,
+        // getLastExecVersion should read it from the file.
+        setStoredVersion("9.123");
+        Assert.assertEquals("9.123", InstallUtil.getLastExecVersion());
+    }
+
+    private void setStoredVersion(String version) throws Exception {
+        Field versionField = Jenkins.class.getDeclaredField("version");
+        versionField.setAccessible(true);
+        versionField.set(jenkinsRule.jenkins, version);
+        Assert.assertEquals(version, Jenkins.getStoredVersion().toString());
+        // Force a save of the config.xml
+        jenkinsRule.jenkins.save();
+    }
+
+    /**
+     * Validate proper statuses are persisted and install status is cleared when invoking appropriate methods on {@link InstallUtil}
+     */
+    @Test
+    public void testSaveAndRestoreInstallingPlugins() throws Exception {
+        final List<UpdateCenterJob> updates = new ArrayList<>();
+
+        final Map<String,String> nameMap = new HashMap<>();
+
+        new UpdateCenter() { // inner classes...
+		{
+			new UpdateSite("foo", "http://omg.org") {
+				{
+					for(String name : Arrays.asList("pending-plug:Pending", "installing-plug:Installing", "failure-plug:Failure", "success-plug:Success")) {
+						String statusType = name.split(":")[1];
+						name = name.split(":")[0];
+
+						InstallationStatus status;
+						if("Success".equals(statusType)) {
+							status = Mockito.mock(Success.class);
+						}
+						else if("Failure".equals(statusType)) {
+							status = Mockito.mock(Failure.class);
+						}
+						else if("Installing".equals(statusType)) {
+							status = Mockito.mock(Installing.class);
+						}
+						else {
+							status = Mockito.mock(Pending.class);
+						}
+
+						nameMap.put(statusType, status.getClass().getSimpleName());
+
+					JSONObject json = new JSONObject();
+					json.put("name", name);
+					json.put("version", "1.1");
+					json.put("url", "http://google.com");
+					json.put("dependencies", new JSONArray());
+					Plugin p = new Plugin(getId(), json);
+
+					InstallationJob job = new InstallationJob(p, null, null, false);
+						job.status = status;
+						job.setCorrelationId(UUID.randomUUID()); // this indicates the plugin was 'directly selected'
+		                updates.add(job);
+			        }
+				}
+			};
+		}
+        };
+
+        InstallUtil.persistInstallStatus(updates);
+
+	Map<String,String> persisted = InstallUtil.getPersistedInstallStatus();
+
+	Assert.assertEquals(nameMap.get("Pending"), persisted.get("pending-plug"));
+	Assert.assertEquals("Pending", persisted.get("installing-plug")); // only marked as success/fail after successful install
+	Assert.assertEquals(nameMap.get("Failure"), persisted.get("failure-plug"));
+	Assert.assertEquals(nameMap.get("Success"), persisted.get("success-plug"));
+
+        InstallUtil.clearInstallStatus();
+
+	persisted = InstallUtil.getPersistedInstallStatus();
+
+	Assert.assertNull(persisted); // should be deleted
+    }
+}
diff --git a/test/src/test/java/jenkins/install/UpgradeWizardTest.java b/test/src/test/java/jenkins/install/UpgradeWizardTest.java
new file mode 100644
index 0000000000..9e98574e43
--- /dev/null
+++ b/test/src/test/java/jenkins/install/UpgradeWizardTest.java
@@ -0,0 +1,108 @@
+package jenkins.install;
+
+import hudson.util.VersionNumber;
+import org.apache.commons.io.FileUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import javax.inject.Inject;
+
+import java.io.IOException;
+import java.util.concurrent.Callable;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class UpgradeWizardTest {
+    @Rule
+    public final JenkinsRule j = new JenkinsRule();
+
+    @Inject
+    UpgradeWizard uw;
+
+    @Before
+    public void setup() {
+        j.jenkins.getInjector().injectMembers(this);
+    }
+
+    @Test
+    public void snooze() throws Exception {
+        j.executeOnServer(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
+                assertTrue(uw.isDue());
+                uw.doSnooze();
+                assertFalse(uw.isDue());
+
+                return null;
+            }
+        });
+    }
+
+    /**
+     * If not upgraded, the upgrade should cause some side effect.
+     */
+    @Test
+    public void upgrade() throws Exception {
+        j.executeOnServer(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
+                assertTrue(j.jenkins.getUpdateCenter().getJobs().size() == 0);
+                assertTrue(newInstance().isDue());
+                assertNotSame(UpgradeWizard.NOOP, uw.doUpgrade());
+
+                // can't really test this because UC metadata is empty
+                // assertTrue(j.jenkins.getUpdateCenter().getJobs().size() > 0);
+
+                return null;
+            }
+        });
+    }
+
+    /**
+     * If already upgraded, don't show anything
+     */
+    @Test
+    public void fullyUpgraded() throws Exception {
+        FileUtils.writeStringToFile(uw.getStateFile(), "2.0");
+        assertFalse(newInstance().isDue());
+        assertSame(UpgradeWizard.NOOP, uw.doUpgrade());
+    }
+
+    /**
+     * If downgraded from future version, don't prompt upgrade wizard.
+     */
+    @Test
+    public void downgradeFromFuture() throws Exception {
+        FileUtils.writeStringToFile(uw.getStateFile(), "3.0");
+        assertFalse(newInstance().isDue());
+        assertSame(UpgradeWizard.NOOP, uw.doUpgrade());
+    }
+
+    @Test
+    public void freshInstallation() throws Exception {
+        j.executeOnServer(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
+                assertTrue(uw.isDue());
+                uw.setCurrentLevel(new VersionNumber("2.0"));
+                assertFalse(uw.isDue());
+
+                return null;
+            }
+        });
+    }
+
+    /**
+     * Fresh instance of {@link UpgradeWizard} to test its behavior.
+     */
+    private UpgradeWizard newInstance() throws IOException {
+        UpgradeWizard uw2 = new UpgradeWizard();
+        j.jenkins.getInjector().injectMembers(uw2);
+        return uw2;
+    }
+}
diff --git a/test/src/test/java/lib/form/RowSetTest.java b/test/src/test/java/lib/form/RowSetTest.java
index 8a8fdb0aa9..05d34658a5 100644
--- a/test/src/test/java/lib/form/RowSetTest.java
+++ b/test/src/test/java/lib/form/RowSetTest.java
@@ -2,6 +2,7 @@ package lib.form;
 
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.RootAction;
+import hudson.security.csrf.CrumbIssuer;
 import junit.framework.Assert;
 import net.sf.json.JSONObject;
 import org.junit.Rule;
@@ -27,12 +28,12 @@ public class RowSetTest {
     public static class Subject implements RootAction {
         public void doSubmitTest1(StaplerRequest req) throws Exception {
             JSONObject json = req.getSubmittedForm();
-            json.remove("crumb");
+            json.remove(CrumbIssuer.DEFAULT_CRUMB_NAME);
             System.out.println(json);
 
             JSONObject expected = JSONObject.fromObject(
                     "{'a':'aaa','b':'bbb','c':{'c1':'ccc1','c2':'ccc2'},'d':{'d1':'d1','d2':'d2'}}");
-            Assert.assertEquals(json,expected);
+            Assert.assertEquals(expected, json);
         }
 
         @Override
diff --git a/test/src/test/resources/plugins/dependee-0.0.2.hpi b/test/src/test/resources/plugins/dependee-0.0.2.hpi
deleted file mode 100644
index 79525b0846..0000000000
Binary files a/test/src/test/resources/plugins/dependee-0.0.2.hpi and /dev/null differ
diff --git a/test/src/test/resources/plugins/depender-0.0.2.hpi b/test/src/test/resources/plugins/depender-0.0.2.hpi
deleted file mode 100644
index 34826d3f77..0000000000
Binary files a/test/src/test/resources/plugins/depender-0.0.2.hpi and /dev/null differ
diff --git a/test/src/test/resources/plugins/mandatory-depender-0.0.2.hpi b/test/src/test/resources/plugins/mandatory-depender-0.0.2.hpi
deleted file mode 100644
index dedc65a62f..0000000000
Binary files a/test/src/test/resources/plugins/mandatory-depender-0.0.2.hpi and /dev/null differ
diff --git a/war/.gitignore b/war/.gitignore
index e500657ff9..7ea4dd8431 100644
--- a/war/.gitignore
+++ b/war/.gitignore
@@ -1,2 +1,10 @@
-work
+work
 /rebel.xml
+
+# Node
+node/
+node_modules/
+npm-debug.log
+
+# Generated JavaScript Bundles
+jsbundles
diff --git a/war/Gruntfile.js b/war/Gruntfile.js
deleted file mode 100644
index 63507e430c..0000000000
--- a/war/Gruntfile.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = function (grunt) {
-  grunt.initConfig({
-
-  });
-
-  grunt.registerTask('build', [
-  ]);
-
-  grunt.registerTask('default', ['build']);
-};
diff --git a/war/gulpfile.js b/war/gulpfile.js
new file mode 100644
index 0000000000..7e1697b031
--- /dev/null
+++ b/war/gulpfile.js
@@ -0,0 +1,46 @@
+//
+// See https://github.com/tfennelly/jenkins-js-builder
+//
+var builder = require('jenkins-js-builder');
+
+//
+// Bundle the page init script.
+// See https://github.com/jenkinsci/js-builder#bundling
+//
+builder.bundle('src/main/js/page-init.js')
+    .withExternalModuleMapping('jquery-detached', 'core-assets/jquery-detached:jquery2')
+    .inDir('src/main/webapp/jsbundles');
+
+//
+// Bundle the Install Wizard.
+// See https://github.com/jenkinsci/js-builder#bundling
+//
+builder.bundle('src/main/js/pluginSetupWizard.js')
+    .withExternalModuleMapping('jquery-detached', 'core-assets/jquery-detached:jquery2')
+    .withExternalModuleMapping('bootstrap', 'core-assets/bootstrap:bootstrap3', {addDefaultCSS: true})
+    .withExternalModuleMapping('handlebars', 'core-assets/handlebars:handlebars3')
+    .less('src/main/less/pluginSetupWizard.less')
+    .inDir('src/main/webapp/jsbundles');
+
+//
+// Bundle the Config Tab Bar.
+// See https://github.com/jenkinsci/js-builder#bundling
+//
+builder.bundle('src/main/js/config-tabbar.js')
+    .withExternalModuleMapping('jquery-detached', 'core-assets/jquery-detached:jquery2')
+    .less('src/main/js/config-tabbar.less')
+    .inDir('src/main/webapp/jsbundles');
+
+//
+// Bundle the Config Scrollspy.
+// See https://github.com/jenkinsci/js-builder#bundling
+//
+builder.bundle('src/main/js/config-scrollspy.js')
+    .withExternalModuleMapping('jquery-detached', 'core-assets/jquery-detached:jquery2')
+    .less('src/main/js/config-scrollspy.less')
+    .inDir('src/main/webapp/jsbundles');
+
+builder.bundle('src/main/js/add-item.js')
+    .withExternalModuleMapping('jquery-detached', 'core-assets/jquery-detached:jquery2')
+    .less('src/main/js/add-item.less')
+    .inDir('src/main/webapp/jsbundles');
diff --git a/war/package.json b/war/package.json
index c35e61d1f8..12e842df90 100644
--- a/war/package.json
+++ b/war/package.json
@@ -1,11 +1,20 @@
 {
-    "name": "jenkins",
-    "version": "0.0.0",
-    "dependencies": {},
-    "devDependencies": {
-        "grunt": "~0.4.1"
-    },
-    "engines": {
-        "node": ">=0.8.0"
-    }
-}
\ No newline at end of file
+  "name": "jenkins-ui",
+  "version": "1.0.0",
+  "description": "Jenkins User Interface",
+  "license": "MIT",
+  "devDependencies": {
+    "gulp": "^3.9.0",
+    "handlebars": "^3.0.3",
+    "hbsfy": "^2.4.1",
+    "jenkins-handlebars-rt": "^1.0.1",
+    "jenkins-js-builder": "0.0.40",
+    "jenkins-js-test": "^1.0.0"
+  },
+  "dependencies": {
+    "bootstrap-detached": "^3.3.5-v1",
+    "jenkins-js-modules": "^1.5.0",
+    "jquery-detached": "^2.1.4-v2",
+    "window-handle": "^1.0.0"
+  }
+}
diff --git a/war/pom.xml b/war/pom.xml
index b0b6011330..aa449dc050 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.657-SNAPSHOT</version>
+    <version>2.0-rc-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
@@ -41,13 +41,15 @@ THE SOFTWARE.
     <JENKINS_HOME>${basedir}/work</JENKINS_HOME>
     <contextPath>/jenkins</contextPath><!-- context path during test -->
     <port>8080</port><!-- HTTP listener port -->
+    <node.version>4.0.0</node.version>
+    <npm.version>2.13.1</npm.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>executable-war</artifactId>
-      <version>1.32</version>
+      <version>1.33</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -77,7 +79,7 @@ THE SOFTWARE.
       <groupId>${project.groupId}</groupId>
       <artifactId>remoting</artifactId>
       <!-- specified in the parent -->
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>cli</artifactId>
@@ -91,7 +93,7 @@ THE SOFTWARE.
       -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>2.9</version>
+      <version>3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -134,6 +136,24 @@ THE SOFTWARE.
       <artifactId>sshd</artifactId>
       <version>1.6</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.ui</groupId>
+      <artifactId>jquery-detached</artifactId>
+      <version>1.2.1</version>
+      <classifier>core-assets</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.ui</groupId>
+      <artifactId>bootstrap</artifactId>
+      <version>1.3.2</version>
+      <classifier>core-assets</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.ui</groupId>
+      <artifactId>handlebars</artifactId>
+      <version>1.1.1</version>
+      <classifier>core-assets</classifier>
+    </dependency>
     <dependency>
       <!--
         We bundle slf4j binding since we got some components (sshd for example)
@@ -252,7 +272,25 @@ THE SOFTWARE.
                   <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
                   <destFileName>winstone.jar</destFileName>
                 </artifactItem>
-                <!-- bundled plugins -->
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/plugins</outputDirectory>
+              <stripVersion>true</stripVersion>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
+          </execution>
+          <execution>
+            <id>detached-plugins</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <!--
+                    Detached plugins and their dependencies - detached plugins that used to be bundled plugins
+                -->
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>maven-plugin</artifactId>
@@ -368,7 +406,7 @@ THE SOFTWARE.
                   <type>hpi</type>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/plugins</outputDirectory>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins</outputDirectory>
               <stripVersion>true</stripVersion>
               <overWriteIfNewer>true</overWriteIfNewer>
               <overWriteReleases>false</overWriteReleases>
@@ -437,7 +475,7 @@ THE SOFTWARE.
           <additionalClassesDirectories>
             <!-- load resoures straight from source -->
             <additionalClassesDirectory>../core/src/main/resources</additionalClassesDirectory>
-            
+
             <!--
               read directly from core module's output directory,
               so that changes are picked up right away without running mvn.
@@ -502,6 +540,7 @@ THE SOFTWARE.
           <webApp>
             <contextPath>${contextPath}</contextPath>
             <configurationDiscovered>false</configurationDiscovered>
+            <webInfIncludeJarPattern>NONE</webInfIncludeJarPattern><!-- see https://wiki.eclipse.org/Jetty/Howto/Avoid_slow_deployment -->
           </webApp>
         </configuration>
       </plugin>
@@ -532,36 +571,92 @@ THE SOFTWARE.
         </plugins>
       </build>
     </profile>
+
+
+    <!--
+        The following profiles are required to integration the node/gulp build into this maven build.
+        Hopefully we can push these profiles down into a parent pom.
+        See https://github.com/tfennelly/jenkins-js-builder#maven-integration
+    -->
+
+    <!--
+        Manually download node and NPM for the frontend plugin so it gets cached in the local maven repo.
+        Otherwise frontend will be downloading it all the time on the CI servers. The download-maven-plugin
+        caches it's downloads in the local maven repo.
+    -->
     <profile>
-      <!-- profile for running Grunt and optimize static resources -->
-      <id>grunt</id>
+        <id>node-classifier-linux</id>
+        <activation><os><family>Linux</family><arch>amd64</arch></os></activation>
+		<properties>
+			<node.download.file>node-v${node.version}-linux-x64.tar.gz</node.download.file>
+			<node.download.classifier />
+		</properties>
+    </profile>
+    <profile>
+        <id>node-classifier-mac</id>
+        <activation><os><family>mac</family></os></activation>
+        <properties>
+			<node.download.file>node-v${node.version}-darwin-x64.tar.gz</node.download.file>
+			<node.download.classifier />
+		</properties>
+    </profile>
+    <profile>
+        <id>node-classifier-windows</id>
+        <activation><os><family>windows</family><arch>x64</arch></os></activation>
+		<properties>
+			<node.download.file>win-x64/node.exe</node.download.file>
+			<node.download.classifier>/x64</node.download.classifier>
+		</properties>
+    </profile>
+    <profile>
+        <id>node-classifier-windows-amd64</id>
+        <activation><os><family>windows</family><arch>amd64</arch></os></activation>
+		<properties>
+			<node.download.file>win-x64/node.exe</node.download.file>
+			<node.download.classifier>/x64</node.download.classifier>
+		</properties>
+    </profile>
+    <profile>
+        <id>node-classifier-windows-x86</id>
+        <activation><os><family>windows</family><arch>x86</arch></os></activation>
+		<properties>
+			<node.download.file>win-x86/node.exe</node.download.file>
+			<node.download.classifier />
+		</properties>
+    </profile>
+    <profile>
+        <id>node-download</id>
+        <activation><file><exists>package.json</exists></file></activation>
         <build>
             <plugins>
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
+                    <groupId>com.googlecode.maven-download-plugin</groupId>
+                    <artifactId>download-maven-plugin</artifactId>
+                    <version>1.2.1</version>
                     <executions>
                         <execution>
-                            <id>install</id>
-                            <phase>validate</phase>
+                            <id>get-node</id>
+                            <phase>initialize</phase>
                             <goals>
-                                <goal>exec</goal>
+                                <goal>wget</goal>
                             </goals>
                             <configuration>
-                                <executable>npm</executable>
-                                <arguments>
-                                    <argument>install</argument>
-                                </arguments>
+                                <url>https://nodejs.org/dist/v${node.version}/${node.download.file}</url>
+                                <unpack>false</unpack>
+                                <outputDirectory>${project.build.directory}/frontend/v${node.version}${node.download.classifier}</outputDirectory>
                             </configuration>
                         </execution>
                         <execution>
-                            <id>grunt</id>
-                            <phase>prepare-package</phase>
+                            <id>get-npm</id>
+                            <phase>initialize</phase>
                             <goals>
-                                <goal>exec</goal>
+                                <goal>wget</goal>
                             </goals>
                             <configuration>
-                                <executable>grunt</executable>
+                                <url>http://registry.npmjs.org/npm/-/npm-${npm.version}.tgz</url>
+                                <unpack>false</unpack>
+                                <outputDirectory>${project.build.directory}/frontend/</outputDirectory>
+                                <outputFileName>npm-${npm.version}.tgz</outputFileName>
                             </configuration>
                         </execution>
                     </executions>
@@ -569,5 +664,127 @@ THE SOFTWARE.
             </plugins>
         </build>
     </profile>
-  </profiles>
+    <profile>
+        <id>gulp-execution</id>
+        <activation>
+            <file>
+                <exists>gulpfile.js</exists>
+            </file>
+        </activation>
+        <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.3.1</version>
+                    <executions>
+                        <execution>
+                            <id>enforce-versions</id>
+                            <goals>
+                                <goal>enforce</goal>
+                            </goals>
+                            <configuration>
+                                <rules>
+                                    <requireMavenVersion>
+                                        <version>3.1.0</version>
+                                    </requireMavenVersion>
+                                </rules>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>com.github.eirslett</groupId>
+                    <artifactId>frontend-maven-plugin</artifactId>
+                    <version>0.0.23</version>
+
+                    <executions>
+
+                        <execution>
+                            <phase>initialize</phase>
+                            <id>install node and npm</id>
+                            <goals>
+                                <goal>install-node-and-npm</goal>
+                            </goals>
+                            <configuration>
+                                <nodeVersion>v${node.version}</nodeVersion>
+                                <npmVersion>${npm.version}</npmVersion>
+                                <!-- Use the pre-download node and npm packages. See download-maven-plugin config above. -->
+                                <downloadRoot>${project.baseUri}target/frontend/</downloadRoot>
+                            </configuration>
+                        </execution>
+
+                        <execution>
+                            <phase>initialize</phase>
+                            <id>npm install</id>
+                            <goals>
+                                <goal>npm</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Note that this may not be omitted lest maven-release-plugin be confused (frontend-maven-plugin #109): -->
+                                <arguments>install</arguments>
+                            </configuration>
+                        </execution>
+
+                        <execution>
+                            <phase>generate-sources</phase>
+                            <id>gulp bundle</id>
+                            <goals>
+                                <goal>gulp</goal>
+                            </goals>
+                            <configuration>
+                                <arguments>bundle</arguments>
+                            </configuration>
+                        </execution>
+
+                        <execution>
+                            <phase>test</phase>
+                            <id>gulp test</id>
+                            <goals>
+                                <goal>gulp</goal>
+                            </goals>
+                            <configuration>
+                              <arguments>bundle test</arguments>
+                              <skip>${skipTests}</skip>
+                            </configuration>
+                        </execution>
+
+                    </executions>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
+
+    <profile>
+        <id>clean-node</id>
+        <activation>
+            <file>
+                <exists>package.json</exists>
+            </file>
+            <property>
+                <name>cleanNode</name>
+            </property>
+        </activation>
+        <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <configuration>
+                        <filesets>
+                            <fileset>
+                                <directory>node</directory>
+                                <followSymlinks>false</followSymlinks>
+                            </fileset>
+                            <fileset>
+                                <directory>node_modules</directory>
+                                <followSymlinks>false</followSymlinks>
+                            </fileset>
+                        </filesets>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
+</profiles>
 </project>
diff --git a/war/src/main/js/add-item.js b/war/src/main/js/add-item.js
new file mode 100644
index 0000000000..a15af8eacc
--- /dev/null
+++ b/war/src/main/js/add-item.js
@@ -0,0 +1,209 @@
+// Initialize all modules by requiring them. Also makes sure they get bundled (see gulpfile.js).
+var $ = require('jquery-detached').getJQuery();
+
+var getItems = function(){
+  var d = $.Deferred();
+  $.get('itemCategories?depth=3').done(
+      function(data){
+        d.resolve(data);
+      }
+  );
+  return d.promise();
+}; 
+
+var jRoot = $('head').attr('data-rooturl');
+
+$.when(getItems()).done(function(data){
+  $(function() {
+
+    //////////////////////////
+    // helper functions...
+
+    function parseResponseFromCheckJobName(data) {
+      var html = $.parseHTML(data);
+      var element = html[0];
+      if (element !== undefined) {
+        return $(element).text();
+      }
+      return undefined;
+    }
+
+    function cleanClassName(className){
+      return className.replace(/\./g,'_');
+    }
+
+    function checkForLink(desc) {
+      if (desc.indexOf('&lt;a href="') === -1) {
+        return desc;
+      }
+      var newDesc = desc.replace(/\&lt;/g,'<').replace(/\&gt;/g,'>');
+      return newDesc;
+    }
+
+    function getItemTypeSelected() {
+      var item = $('input[type="radio"][name="mode"]:checked', '#createItem').val();
+      if (item === "copy") {
+        return undefined;
+      }
+      return item;
+    }
+
+    function getItemCopyFromSelected() {
+      return $('input[type="radio"][name="mode"][value="copy"]:checked', '#createItem').val();
+    }
+
+    function getCopyFromValue() {
+      return $('input[type="text"][name="from"]', '#createItem').val();
+    }
+
+    function isItemNameEmpty() {
+      var itemName = $('input[name="name"]', '#createItem').val();
+      return (itemName === '') ? true : false;
+    }
+
+    function activateValidationMessage(messageId, context, message) {
+      if (message !== undefined && message !== '') {
+        $(messageId, context).html('&#187; ' + message);
+      }
+      cleanValidationMessages(context);
+      hideInputHelp(context);
+      $(messageId).removeClass('input-message-disabled');
+    }
+
+    function cleanValidationMessages(context) {
+      $(context).find('.input-validation-message').addClass('input-message-disabled');
+    }
+
+    function hideInputHelp(context) {
+      $('.input-help', context).addClass('input-message-disabled');
+    }
+
+    function showInputHelp(context) {
+      $('.input-help', context).removeClass('input-message-disabled');
+    }
+
+    //////////////////////////////////
+    // Draw functions
+
+    function drawCategory(category) {
+      var $category = $('<div/>').addClass('category').attr('id', 'j-add-item-type-' + cleanClassName(category.id));
+      var $items = $('<ul"/>').addClass('j-item-options');
+      var $catHeader = $('<div class="header" />');
+      var title = '<h2>' + category.name + '</h2>';
+      var description = '<p>' + category.description + '</p>';
+
+      // Add items
+      $.each(category.items, function(i, elem) {
+        $items.append(drawItem(elem));
+      });
+
+      $catHeader.append(title);
+      $catHeader.append(description);
+      $category.append($catHeader);
+      $category.append($items);
+
+      return $category;
+    }
+
+    function drawItem(elem) {
+      var desc = checkForLink(elem.description);
+      var $item = $(['<li class="', cleanClassName(elem.class), '"><label><input type="radio" name="mode" value="',
+      elem.class ,'"/> <span class="label">', elem.displayName, '</span></label></li>'].join('')).append(['<div class="desc">', desc, '</div>'].join('')).append(drawIcon(elem));
+
+      function setSelectState(e) {
+        e.preventDefault();
+        var $this = $(this).closest('li');
+        $this.closest('.categories').find('input[type="radio"][name="mode"]').removeAttr('checked');
+        $this.closest('.categories').find('.active').removeClass('active');
+        $this.addClass('active');
+        $this.find('input[type="radio"][name="mode"]').prop('checked', true);
+        $('input[type="text"][name="from"]', '#createItem').val('');
+        cleanValidationMessages('.add-item-copy');
+        if (isItemNameEmpty()) {
+          activateValidationMessage('#itemname-required', '.add-item-name');
+        }
+      }
+      $item.click(setSelectState);
+
+      return $item;
+    }
+
+    function drawIcon(elem) {
+      var $icn;
+      if (elem.iconFilePathPattern) {
+        $icn = $('<div class="icon">');
+        var iconFilePath = jRoot + '/' + elem.iconFilePathPattern.replace(":size", "48x48");
+        $(['<img src="', iconFilePath, '">'].join('')).appendTo($icn);
+      } else {
+        $icn = $('<div class="default-icon">');
+        var colors = ['c-49728B','c-335061','c-D33833','c-6D6B6D', 'c-6699CC'];
+        var desc = elem.description || '';
+        var name = elem.displayName;
+        var colorClass= colors[(desc.length) % 4];
+        var aName = name.split(' ');
+        var a = name.substring(0,1);
+        var b = ((aName.length === 1) ? name.substring(1,2) : aName[1].substring(0,1));
+        $(['<span class="a">',a,'</span><span class="b">',b,'</span>'].join('')).appendTo($icn);
+        $icn.addClass(colorClass);
+      }
+      return $icn;
+    }
+
+    // The main panel content is hidden by default via an inline style. We're ready to remove that now.
+    $('#add-item-panel').removeAttr('style');
+
+    // Render all categories
+    var $categories = $('div.categories');
+    $.each(data.categories, function(i, elem) {
+      drawCategory(elem).appendTo($categories);
+    });
+
+    // Focus
+    $("#add-item-panel").find("#name").focus();
+
+    // Init NameField
+    $('input[name="name"]', '#createItem').blur(function() {
+      if (!isItemNameEmpty()) {
+        var itemName = $('input[name="name"]', '#createItem').val();
+        $.get("checkJobName", { value: itemName }).done(function(data) {
+          var message = parseResponseFromCheckJobName(data);
+          if (message !== '') {
+            activateValidationMessage('#itemname-invalid', '.add-item-name', message);
+          } else {
+            cleanValidationMessages('.add-item-name');
+            showInputHelp('.add-item-name');
+          }
+        });
+      } else {
+        activateValidationMessage('#itemname-required', '.add-item-name');
+      }
+    });
+
+    // Init CopyFromField
+    $('input[name="from"]', '#createItem').focus(function() {
+      $('#createItem').find('input[type="radio"][value="copy"]').prop('checked', true);
+      $('.categories').find('.active').removeClass('active');
+    });
+
+    $('input[name="from"]', '#createItem').blur(function() {
+      if (getCopyFromValue() === '') {
+        $('#createItem').find('input[type="radio"][value="copy"]').prop('checked', false);
+      }
+    });
+
+    // Client-side validation
+    $("#createItem").submit(function(event) {
+      if (isItemNameEmpty()) {
+        activateValidationMessage('#itemname-required', '.add-item-name');
+        $('input[name="name"][type="text"]', '#createItem').focus();
+        event.preventDefault();
+      } else {
+        if (getItemTypeSelected() === undefined && getItemCopyFromSelected() === undefined) {
+          activateValidationMessage('#itemtype-required', '.add-item-name');
+          $('input[name="name"][type="text"]', '#createItem').focus();
+          event.preventDefault();
+        }
+      }
+    });
+  });
+});
diff --git a/war/src/main/js/add-item.less b/war/src/main/js/add-item.less
new file mode 100644
index 0000000000..78e63b25fd
--- /dev/null
+++ b/war/src/main/js/add-item.less
@@ -0,0 +1,13 @@
+@import "widgets/variables";
+
+/*
+ * Mixins
+ * http://lesscss.org/features/#mixins-feature
+ */
+@import "widgets/layout-mixins";
+
+/*
+ * Widget styles
+ */
+@import "widgets/config/tabbar";
+@import "widgets/add/addform";
diff --git a/war/src/main/js/api/pluginManager.js b/war/src/main/js/api/pluginManager.js
new file mode 100644
index 0000000000..e81623dec4
--- /dev/null
+++ b/war/src/main/js/api/pluginManager.js
@@ -0,0 +1,188 @@
+/**
+ * Provides a wrapper to interact with the plugin manager & update center
+ */
+
+var jenkins = require('../util/jenkins');
+
+// TODO: Get plugin info (plugins + recommended plugin list) from update center.
+// For now, we statically store them in the wizard.
+
+var plugins = require('./plugins.js');
+plugins.names =[];
+for (var i = 0; i < plugins.availablePlugins.length; i++) {
+    var pluginCategory = plugins.availablePlugins[i];
+    var categoryPlugins = pluginCategory.plugins;
+    for (var ii = 0; ii < categoryPlugins.length; ii++) {
+        var pluginName = categoryPlugins[ii].name;
+        if (plugins.names.indexOf(pluginName) === -1) {
+            plugins.names.push(pluginName);
+        }
+    }
+}
+
+// default 10 seconds for AJAX responses to return before triggering an error condition
+var pluginManagerErrorTimeoutMillis = 10 * 1000;
+
+/**
+ * Get the curated list of plugins to be offered in the wizard.
+ * @returns The curated list of plugins to be offered in the wizard.
+ */
+exports.plugins = function() {
+    return plugins.availablePlugins;
+};
+
+/**
+ * Get the curated list of plugins to be offered in the wizard by name only.
+ * @returns The curated list of plugins to be offered in the wizard by name only.
+ */
+exports.pluginNames = function() {
+    return plugins.names;
+};
+
+/**
+ * Get the subset of plugins (subset of the plugin list) that are recommended by default.
+ * <p>
+ * The user can easily change this selection.
+ * @returns The subset of plugins (subset of the plugin list) that are recommended by default.
+ */
+exports.recommendedPluginNames = function() {
+    return plugins.recommendedPlugins.slice(); // copy this
+};
+
+/**
+ * Call this function to install plugins, will pass a correlationId to the complete callback which
+ * may be used to restrict further calls getting plugin lists. Note: do not use the correlation id.
+ * If handler is called with this.isError, there will be a corresponding this.errorMessage indicating
+ * the failure reason
+ */
+exports.installPlugins = function(plugins, handler) {
+	jenkins.post('/pluginManager/installPlugins', { dynamicLoad: true, plugins: plugins }, function(response) {
+		if(response.status !== 'ok') {
+			handler.call({ isError: true, errorMessage: response.message });
+			return;
+		}
+
+		handler.call({ isError: false }, response.data.correlationId);
+	}, {
+		timeout: pluginManagerErrorTimeoutMillis,
+		error: function(xhr, textStatus, errorThrown) {
+			handler.call({ isError: true, errorMessage: errorThrown });
+		}
+	});
+};
+
+/**
+ * Accepts 1 or 2 arguments, if argument 2 is not provided all installing plugins will be passed
+ * to the handler function. If argument 2 is non-null, it will be treated as a correlationId, which
+ * must be retrieved from a prior installPlugins call.
+ */
+exports.installStatus = function(handler, correlationId) {
+	var url = '/updateCenter/installStatus';
+	if(correlationId !== undefined) {
+		url += '?correlationId=' + correlationId;
+	}
+	jenkins.get(url, function(response) {
+		if(response.status !== 'ok') {
+			handler.call({ isError: true, errorMessage: response.message });
+			return;
+		}
+
+		handler.call({ isError: false }, response.data);
+	}, {
+		timeout: pluginManagerErrorTimeoutMillis,
+		error: function(xhr, textStatus, errorThrown) {
+			handler.call({ isError: true, errorMessage: errorThrown });
+		}
+	});
+};
+
+/**
+ * Provides a list of the available plugins, some useful properties is:
+ * [
+ * 	{ name, title, excerpt, dependencies[], ... },
+ *  ...
+ * ]
+ */
+exports.availablePlugins = function(handler) {
+	jenkins.get('/pluginManager/plugins', function(response) {
+		if(response.status !== 'ok') {
+			handler.call({ isError: true, errorMessage: response.message });
+			return;
+		}
+
+		handler.call({ isError: false }, response.data);
+	}, {
+		timeout: pluginManagerErrorTimeoutMillis,
+		error: function(xhr, textStatus, errorThrown) {
+			handler.call({ isError: true, errorMessage: errorThrown });
+		}
+	});
+};
+
+
+/**
+ * Accepts 1 or 2 arguments, if argument 2 is not provided all installing plugins will be passed
+ * to the handler function. If argument 2 is non-null, it will be treated as a correlationId, which
+ * must be retrieved from a prior installPlugins call.
+ */
+exports.incompleteInstallStatus = function(handler, correlationId) {
+	var url = '/updateCenter/incompleteInstallStatus';
+	if(correlationId !== undefined) {
+		url += '?correlationId=' + correlationId;
+	}
+	jenkins.get(url, function(response) {
+		if(response.status !== 'ok') {
+			handler.call({ isError: true, errorMessage: response.message });
+			return;
+		}
+
+		handler.call({ isError: false }, response.data);
+	}, {
+		timeout: pluginManagerErrorTimeoutMillis,
+		error: function(xhr, textStatus, errorThrown) {
+			handler.call({ isError: true, errorMessage: errorThrown });
+		}
+	});
+};
+
+/**
+ * Call this to complete the installation without installing anything
+ */
+exports.completeInstall = function(handler) {
+	jenkins.get('/setupWizard/completeInstall', function() {
+		handler.call({ isError: false });
+	}, {
+		timeout: pluginManagerErrorTimeoutMillis,
+		error: function(xhr, textStatus, errorThrown) {
+			handler.call({ isError: true, message: errorThrown });
+		}
+	});
+};
+
+/**
+ * Indicates there is a restart required to complete plugin installations
+ */
+exports.isRestartRequired = function(handler) {
+	jenkins.get('/updateCenter/api/json?tree=restartRequiredForCompletion', function(response) {
+		handler.call({ isError: false }, response.data);
+	}, {
+		timeout: pluginManagerErrorTimeoutMillis,
+		error: function(xhr, textStatus, errorThrown) {
+			handler.call({ isError: true, message: errorThrown });
+		}
+	});
+};
+
+/**
+ * Restart Jenkins
+ */
+exports.restartJenkins = function(handler) {
+	jenkins.get('/updateCenter/safeRestart', function() {
+		handler.call({ isError: false });
+	}, {
+		timeout: pluginManagerErrorTimeoutMillis,
+		error: function(xhr, textStatus, errorThrown) {
+			handler.call({ isError: true, message: errorThrown });
+		}
+	});
+};
diff --git a/war/src/main/js/api/plugins.js b/war/src/main/js/api/plugins.js
new file mode 100644
index 0000000000..4e3a7420cf
--- /dev/null
+++ b/war/src/main/js/api/plugins.js
@@ -0,0 +1,140 @@
+//
+// TODO: Get all of this information from the Update Center via a REST API.
+//
+
+//
+// TODO: Decide on what the real "recommended" plugin set is. This is just a 1st stab.
+// Also remember, the user ultimately has full control as they can easily customize
+// away from these.
+//
+exports.recommendedPlugins = [
+    "ant",
+    "antisamy-markup-formatter",
+    "build-timeout",
+    "cloudbees-folder",
+    "credentials-binding",
+    "email-ext",
+    "git",
+    "gradle",
+    "ldap",
+    "mailer",
+    "matrix-auth",
+    "pam-auth",
+    "pipeline-stage-view",
+    "ssh-slaves",
+    "subversion",
+    "timestamper",
+    "workflow-aggregator",
+    "github-organization-folder",
+    "ws-cleanup"
+];
+
+//
+// A Categorized list of the plugins offered for install in the wizard.
+// This is a community curated list.
+//
+exports.availablePlugins = [
+    {
+        "category":"Organization and Administration",
+        "plugins": [
+            { "name": "dashboard-view" },
+            { "name": "cloudbees-folder" },
+            { "name": "antisamy-markup-formatter" }
+        ]
+    },
+    {
+        "category":"Build Features",
+        "description":"Add general purpose features to your jobs",
+        "plugins": [
+            { "name": "build-name-setter" },
+            { "name": "build-timeout" },
+            { "name": "config-file-provider" },
+            { "name": "credentials-binding" },
+            { "name": "embeddable-build-status" },
+            { "name": "rebuild" },
+            { "name": "ssh-agent" },
+            { "name": "throttle-concurrents" },
+            { "name": "timestamper" },
+            { "name": "ws-cleanup" }
+        ]
+    },
+    {
+        "category":"Build Tools",
+        "plugins": [
+            { "name": "ant" },
+            { "name": "gradle" },
+            { "name": "msbuild" },
+            { "name": "nodejs" }
+        ]
+    },
+    {
+        "category":"Build Analysis and Reporting",
+        "plugins": [
+            { "name": "checkstyle" },
+            { "name": "cobertura" },
+            { "name": "htmlpublisher" },
+            { "name": "junit" },
+            { "name": "warnings" },
+            { "name": "xunit" }
+        ]
+    },
+    {
+        "category":"Pipelines and Continuous Delivery",
+        "plugins": [
+            { "name": "workflow-aggregator" },
+            { "name": "github-organization-folder" },
+            { "name": "pipeline-stage-view" },
+            { "name": "build-pipeline-plugin" },
+            { "name": "conditional-buildstep" },
+            { "name": "jenkins-multijob-plugin" },
+            { "name": "parameterized-trigger" },
+            { "name": "copyartifact" }
+        ]
+    },
+    {
+        "category":"Source Code Management",
+        "plugins": [
+            { "name": "bitbucket" },
+            { "name": "clearcase" },
+            { "name": "cvs" },
+            { "name": "git" },
+            { "name": "git-parameter" },
+            { "name": "github" },
+            { "name": "gitlab-plugin" },
+            { "name": "p4" },
+            { "name": "repo" },
+            { "name": "subversion" },
+            { "name": "teamconcert" },
+            { "name": "tfs" }
+        ]
+    },
+    {
+        "category":"Distributed Builds",
+        "plugins": [
+            { "name": "matrix-project" },
+            { "name": "ssh-slaves" },
+            { "name": "windows-slaves" }
+        ]
+    },
+    {
+        "category":"User Management and Security",
+        "plugins": [            
+            { "name": "matrix-auth" },
+            { "name": "pam-auth" },
+            { "name": "ldap" },
+            { "name": "role-strategy" },
+            { "name": "active-directory" }
+        ]
+    },
+    {
+        "category":"Notifications and Publishing",
+        "plugins": [
+            { "name": "email-ext" },
+            { "name": "emailext-template" },
+            { "name": "mailer" },
+            { "name": "publish-over-ssh" },
+            // { "name": "slack" }, // JENKINS-33571, https://github.com/jenkinsci/slack-plugin/issues/191
+            { "name": "ssh" }
+        ]
+    }
+];
diff --git a/war/src/main/js/api/securityConfig.js b/war/src/main/js/api/securityConfig.js
new file mode 100644
index 0000000000..7e4997df22
--- /dev/null
+++ b/war/src/main/js/api/securityConfig.js
@@ -0,0 +1,31 @@
+/**
+ * Provides a wrapper to interact with the security configuration
+ */
+
+var jenkins = require('../util/jenkins');
+
+/**
+ * Calls a stapler post method to save the first user settings
+ */
+exports.saveFirstUser = function($form, success, error) {
+	jenkins.staplerPost(
+			'/setupWizard/createAdminUser',
+		$form,
+		success, {
+			dataType: 'html',
+			error: error
+		});
+};
+
+/**
+ * Calls a stapler post method to save the first user settings
+ */
+exports.saveProxy = function($form, success, error) {
+	jenkins.staplerPost(
+			'/pluginManager/proxyConfigure',
+		$form,
+		success, {
+			dataType: 'html',
+			error: error
+		});
+};
diff --git a/war/src/main/js/config-scrollspy.js b/war/src/main/js/config-scrollspy.js
new file mode 100644
index 0000000000..1ed2dca34e
--- /dev/null
+++ b/war/src/main/js/config-scrollspy.js
@@ -0,0 +1,155 @@
+var $ = require('jquery-detached').getJQuery();
+var page = require('./util/page.js');
+var windowHandle = require('window-handle');
+var isScrolling = false;
+var ignoreNextScrollEvent = false;
+var pageHeaderHeight = page.pageHeaderHeight();
+var breadcrumbBarHeight = page.breadcrumbBarHeight();
+
+// Some stuff useful for testing.
+exports.tabbars = [];
+exports.scrollspeed = 500;
+var eventListeners = [];
+exports.on = function(listener) {
+    eventListeners.push(listener);
+};
+function notify(event) {
+    for (var i = 0; i < eventListeners.length; i++) {
+        eventListeners[i](event);
+    }
+}
+
+$(function() {
+    var tabBarWidget = require('./widgets/config/tabbar.js');
+
+    tabBarWidget.addPageTabs('.config-table.scrollspy', function(tabBar) {
+        exports.tabbars.push(tabBar);
+
+        tabBarWidget.addFinderToggle(tabBar);
+        tabBar.onShowSection(function() {
+            // Scroll to the section.
+            scrollTo(this, tabBar);
+            // Hook back into hudson-behavior.js
+            page.fireBottomStickerAdjustEvent();
+        });
+
+        autoActivateTabs(tabBar);
+        page.onWinScroll(function () {
+            autoActivateTabs(tabBar);
+        });
+        page.onWinScroll(function () {
+            stickTabbar(tabBar);
+        });
+    }, {trackSectionVisibility: true});
+});
+
+function scrollTo(section, tabBar) {
+    var $header = section.headerRow;
+    var scrollTop = $header.offset().top - ($('#main-panel .jenkins-config-widgets').outerHeight() + 15);
+
+    isScrolling = true;
+    $('html,body').animate({
+        scrollTop: scrollTop
+    }, exports.scrollspeed, function() {
+        if (isScrolling) {
+            notify({
+                type: 'click_scrollto',
+                section: section
+            });
+            isScrolling = false;
+            ignoreNextScrollEvent = stickTabbar(tabBar);
+        }
+    });
+}
+
+/**
+ * Watch page scrolling, changing the active tab as needed.
+ * @param tabBar The tabbar.
+ */
+function autoActivateTabs(tabBar) {
+    if (isScrolling === true) {
+        // Ignore window scroll events while we are doing a scroll.
+        // See scrollTo function.
+        return;
+    }
+    if (ignoreNextScrollEvent === true) {
+        // Things like repositioning of the tabbar (see stickTabbar)
+        // can trigger scroll events that we want to ignore.
+        ignoreNextScrollEvent = false;
+        return;
+    }
+
+    var winScrollTop = page.winScrollTop();
+    var sections = tabBar.sections;
+
+    // calculate the top and height of each section to know where to switch the tabs...
+    $.each(sections, function (i, section) {
+        if (!section.isVisible()) {
+            return;
+        }
+        
+        // each section enters the viewport at its distance down the page, less the height of
+        // the toolbar, which hangs down the page. Or it is zero if the section doesn't
+        // match or was removed...
+        var viewportEntryOffset = section.getViewportEntryOffset();
+        // height of this one is the top of the next, less the top of this one.
+        var sectionHeight = 0;
+        var nextSection = nextVisibleSection(section);
+        if (nextSection) {
+            sectionHeight = nextSection.getViewportEntryOffset() - viewportEntryOffset;
+        }
+
+        // the trigger point to change the tab happens when the scroll position passes below the height of the section...
+        // ...but we want to wait to advance the tab until the existing section is 75% off the top...
+        // ### < 75% ADVANCED
+        if (winScrollTop < (viewportEntryOffset + (0.75 * sectionHeight))) {
+            section.markAsActive();
+            notify({
+                type: 'manual_scrollto',
+                section: section
+            });
+            return false;
+        }
+    });
+}
+
+/**
+ * Stick the scrollspy tabbar to the top of the visible area as the user
+ * scrolls down the page.
+ * @param tabBar The tabbar.
+ */
+function stickTabbar(tabBar) {
+    var win = $(windowHandle.getWindow());
+    var winScrollTop = page.winScrollTop();
+    var widgetBox = tabBar.configWidgets;
+    var configTable = tabBar.configTable;
+    var configForm = tabBar.configForm;
+    var setWidth = function() {
+        widgetBox.width(configForm.outerWidth() - 2);
+    };
+
+    if (winScrollTop > pageHeaderHeight - 5) {
+        setWidth();
+        widgetBox.css({
+            'position': 'fixed',
+            'top': (breadcrumbBarHeight - 5 ) + 'px',
+            'margin': '0 auto !important'
+        });
+        configTable.css({'margin-top': widgetBox.outerHeight() + 'px'});
+        win.resize(setWidth);
+        return true;
+    } else {
+        widgetBox.removeAttr('style');
+        configTable.removeAttr('style');
+        win.unbind('resize', setWidth);
+        return false;
+    }
+}
+
+function nextVisibleSection(section) {
+    var next = section.getSibling(+1);
+    while (next && !next.isVisible()) {
+        next = next.getSibling(+1);
+    }
+    return next;
+}
diff --git a/war/src/main/js/config-scrollspy.less b/war/src/main/js/config-scrollspy.less
new file mode 100644
index 0000000000..0b572f61d4
--- /dev/null
+++ b/war/src/main/js/config-scrollspy.less
@@ -0,0 +1,35 @@
+@import "widgets/variables";
+
+/*
+ * Mixins
+ * http://lesscss.org/features/#mixins-feature
+ */
+@import "widgets/layout-mixins";
+@import "widgets/form/form-mixins";
+
+/*
+ * Widget styles
+ */
+@import "widgets/config/tabbar";
+
+/*
+ * ----------------------------------------------------------------------------------------
+ * Scrollspy specific styles.
+ * ----------------------------------------------------------------------------------------
+ */
+
+.jenkins-config {
+  // The Section header for the General section was manufactured,
+  // so the default is to not display it.
+  .section-header-row.config_general .section-header {
+    display: none;
+  }
+}
+
+.jenkins-config-widgets {
+  .find-container {
+    .find {
+      display: none;
+    }
+  }
+}
\ No newline at end of file
diff --git a/war/src/main/js/config-tabbar.js b/war/src/main/js/config-tabbar.js
new file mode 100644
index 0000000000..ada0ded36d
--- /dev/null
+++ b/war/src/main/js/config-tabbar.js
@@ -0,0 +1,35 @@
+var $ = require('jquery-detached').getJQuery();
+var page = require('./util/page.js');
+var jenkinsLocalStorage = require('./util/jenkinsLocalStorage.js');
+
+exports.tabs = []; // Useful for testing.
+
+$(function() {
+    var tabBarWidget = require('./widgets/config/tabbar.js');
+
+    tabBarWidget.addPageTabs('.config-table.tabbed', function(tabBar) {
+        exports.tabs.push(tabBar);
+
+        // We want to merge some sections together.
+        // Merge the "Advanced" section into the "General" section.
+        var generalSection = tabBar.getSection('config_general');
+        if (generalSection) {
+            generalSection.adoptSection('config_advanced_project_options');
+        }
+
+        tabBarWidget.addFinderToggle(tabBar);
+        tabBar.onShowSection(function() {
+            // Hook back into hudson-behavior.js
+            page.fireBottomStickerAdjustEvent();
+        });
+
+        if (tabBar.hasSections()) {
+            var tabBarLastSectionKey = 'config:' + tabBar.configForm.attr('name') + ':last-tab';
+            var tabBarLastSection = jenkinsLocalStorage.getPageItem(tabBarLastSectionKey, tabBar.sections[0].id);
+            tabBar.onShowSection(function() {
+                jenkinsLocalStorage.setPageItem(tabBarLastSectionKey, this.id);
+            });
+            tabBar.showSection(tabBarLastSection);
+        }
+    });
+});
\ No newline at end of file
diff --git a/war/src/main/js/config-tabbar.less b/war/src/main/js/config-tabbar.less
new file mode 100644
index 0000000000..2ab6a24396
--- /dev/null
+++ b/war/src/main/js/config-tabbar.less
@@ -0,0 +1,33 @@
+@import "widgets/variables";
+
+/*
+ * Mixins
+ * http://lesscss.org/features/#mixins-feature
+ */
+@import "widgets/layout-mixins";
+@import "widgets/form/form-mixins";
+
+/*
+ * Widget styles
+ */
+@import "widgets/config/tabbar";
+
+
+/*
+ * ----------------------------------------------------------------------------------------
+ * Tab bar specific styles.
+ * ----------------------------------------------------------------------------------------
+ */
+
+.jenkins-config {
+
+  // For a tabbar, the default is to hide all of the table rows.
+  tr.config-table-top-row {
+    display: none;
+  }
+  // ... and then show them when given the "active" class.
+  tr.config-table-top-row.active {
+    display: table-row;
+  }
+
+}
\ No newline at end of file
diff --git a/war/src/main/js/page-init.js b/war/src/main/js/page-init.js
new file mode 100644
index 0000000000..e7ddae3a6b
--- /dev/null
+++ b/war/src/main/js/page-init.js
@@ -0,0 +1,37 @@
+/*
+ * Page initialisation tasks.
+ */
+
+var $ = require('jquery-detached').getJQuery();
+var jsModules = require('jenkins-js-modules');
+
+$(function() {
+    loadScripts();
+    loadCSS();
+});
+
+function loadScripts() {
+    $('.jenkins-js-load').each(function () {
+        var scriptUrl = $(this).attr('data-src');
+        if (scriptUrl) {
+            // jsModules.addScript will ensure that the script is
+            // loaded once and once only. So, this can be considered
+            // analogous to a client-side adjunct.
+            jsModules.addScript(scriptUrl);
+            $(this).remove();
+        }
+    });
+}
+
+function loadCSS() {
+    $('.jenkins-css-load').each(function () {
+        var cssUrl = $(this).attr('data-src');
+        if (cssUrl) {
+            // jsModules.addCSSToPage will ensure that the CSS is
+            // loaded once and once only. So, this can be considered
+            // analogous to a client-side adjunct.
+            jsModules.addCSSToPage(cssUrl);
+            $(this).remove();
+        }
+    });
+}
diff --git a/war/src/main/js/pluginSetupWizard.js b/war/src/main/js/pluginSetupWizard.js
new file mode 100644
index 0000000000..a5d3af7222
--- /dev/null
+++ b/war/src/main/js/pluginSetupWizard.js
@@ -0,0 +1,15 @@
+// Initialize all modules by requiring them. Also makes sure they get bundled (see gulpfile.js).
+var $ = require('jquery-detached').getJQuery();
+
+// This is the main module
+var pluginSetupWizard = require('./pluginSetupWizardGui');
+
+// This entry point for the bundle only bootstraps the main module in a browser
+$(function() {
+	$('.plugin-setup-wizard-container').each(function() {
+		var $container = $(this);
+		if($container.children().length === 0) { // this may get double-initialized
+			pluginSetupWizard.init($container);
+		}
+	});
+});
diff --git a/war/src/main/js/pluginSetupWizardGui.js b/war/src/main/js/pluginSetupWizardGui.js
new file mode 100644
index 0000000000..c471869d3e
--- /dev/null
+++ b/war/src/main/js/pluginSetupWizardGui.js
@@ -0,0 +1,923 @@
+/**
+ * Jenkins first-run install wizard
+ */
+
+// Require modules here, make sure they get browserify'd/bundled
+var jquery = require('jquery-detached');
+var bootstrap = require('bootstrap-detached');
+var jenkins = require('./util/jenkins');
+var pluginManager = require('./api/pluginManager');
+var securityConfig = require('./api/securityConfig');
+
+window.zq = jquery.getJQuery();
+
+// Setup the dialog, exported
+var createPluginSetupWizard = function(appendTarget) {
+	// call getJQuery / getBootstrap within the main function so it will work with tests -- if getJQuery etc is called in the main
+	var $ = jquery.getJQuery();
+	var $bs = bootstrap.getBootstrap();
+
+	var Handlebars = jenkins.initHandlebars();
+
+	// Necessary handlebars helpers:
+	// returns the plugin count string per category selected vs. available e.g. (5/44)
+	Handlebars.registerHelper('pluginCountForCategory', function(cat) {
+		var plugs = categorizedPlugins[cat];
+		var tot = 0;
+		var cnt = 0;
+		for(var i = 0; i < plugs.length; i++) {
+			var plug = plugs[i];
+			if(plug.category === cat) {
+				tot++;
+				if(selectedPluginNames.indexOf(plug.plugin.name) >= 0) {
+					cnt++;
+				}
+			}
+		}
+		return '(' + cnt + '/' + tot + ')';
+	});
+
+	// returns the total plugin count string selected vs. total e.g. (5/44)
+	Handlebars.registerHelper('totalPluginCount', function() {
+		var tot = 0;
+		var cnt = 0;
+		for(var i = 0; i < pluginList.length; i++) {
+			var a = pluginList[i];
+			for(var c = 0; c < a.plugins.length; c++) {
+				var plug = a.plugins[c];
+				tot++;
+				if(selectedPluginNames.indexOf(plug.name) >= 0) {
+					cnt++;
+				}
+			}
+		}
+		return '(' + cnt + '/' + tot + ')';
+	});
+
+	// determines if the provided plugin is in the list currently selected
+	Handlebars.registerHelper('inSelectedPlugins', function(val, options) {
+		if(selectedPluginNames.indexOf(val) >= 0) {
+			return options.fn();
+		}
+	});
+
+	// executes a block if there are dependencies
+	Handlebars.registerHelper('hasDependencies', function(plugName, options) {
+		var plug = availablePlugins[plugName];
+		if(plug && plug.allDependencies && plug.allDependencies.length > 1) { // includes self
+			return options.fn();
+		}
+	});
+
+	// get total number of dependencies
+	Handlebars.registerHelper('dependencyCount', function(plugName) {
+		var plug = availablePlugins[plugName];
+		if(plug && plug.allDependencies && plug.allDependencies.length > 1) { // includes self
+			return plug.allDependencies.length - 1;
+		}
+	});
+
+	// gets user friendly dependency text
+	Handlebars.registerHelper('eachDependency', function(plugName, options) {
+		var plug = availablePlugins[plugName];
+		if(!plug) {
+			return '';
+		}
+		var deps = $.grep(plug.allDependencies, function(value) { // remove self
+			return value !== plugName;
+		});
+		
+		var out  = '';
+		for(var i = 0; i < deps.length; i++) {
+			var depName = deps[i];
+			var dep = availablePlugins[depName];
+			if(dep) {
+				out += options.fn(dep);
+			}
+		}
+		return out;
+	});
+
+	// executes a block if there are dependencies
+	Handlebars.registerHelper('ifVisibleDependency', function(plugName, options) {
+		if(visibleDependencies[plugName]) {
+			return options.fn();
+		}
+	});
+
+	// Include handlebars templates here - explicitly require them and they'll be available by hbsfy as part of the bundle process
+	var errorPanel = require('./templates/errorPanel.hbs');
+	var loadingPanel = require('./templates/loadingPanel.hbs');
+	var welcomePanel = require('./templates/welcomePanel.hbs');
+	var progressPanel = require('./templates/progressPanel.hbs');
+	var pluginSelectionPanel = require('./templates/pluginSelectionPanel.hbs');
+	var setupCompletePanel = require('./templates/setupCompletePanel.hbs');
+	var proxyConfigPanel = require('./templates/proxyConfigPanel.hbs');
+	var firstUserPanel = require('./templates/firstUserPanel.hbs');
+	var offlinePanel = require('./templates/offlinePanel.hbs');
+	var pluginSetupWizard = require('./templates/pluginSetupWizard.hbs');
+	var incompleteInstallationPanel = require('./templates/incompleteInstallationPanel.hbs');
+
+	// wrap calls with this method to handle generic errors returned by the plugin manager
+	var handleGenericError = function(success) {
+		return function() {
+			if(this.isError) {
+				var errorMessage = this.errorMessage;
+				if(!errorMessage || this.errorMessage === 'timeout') {
+					errorMessage = translations.installWizard_error_connection;
+				}
+				else {
+					errorMessage = translations.installWizard_error_message + " " + errorMessage;
+				}
+				setPanel(errorPanel, { errorMessage: errorMessage });
+				return;
+			}
+			success.apply(this, arguments);
+		};
+	};
+
+	// state variables for plugin data, selected plugins, etc.:
+	var pluginList = pluginManager.plugins();
+	var allPluginNames = pluginManager.pluginNames();
+	var selectedPluginNames = pluginManager.recommendedPluginNames();
+	var visibleDependencies = {};
+	var categories = [];
+	var availablePlugins = {};
+	var categorizedPlugins = {};
+
+	// Instantiate the wizard panel
+	var $wizard = $(pluginSetupWizard());
+	$wizard.appendTo(appendTarget);
+	var $container = $wizard.find('.modal-content');
+	var currentPanel;
+
+	// show tooltips; this is done here to work around a bootstrap/prototype incompatibility
+	$(document).on('mouseenter', '*[data-tooltip]', function() {
+		var $tip = $bs(this);
+		var text = $tip.attr('data-tooltip');
+		if(!text) {
+			return;
+		}
+		// prototype/bootstrap tooltip incompatibility - triggering main element to be hidden
+		this.hide = undefined;
+		$tip.tooltip({
+			html: true,
+			title: text
+		}).tooltip('show');
+	});
+
+	// localized messages
+	var translations = {};
+
+	var decorations = [
+		function() {
+		// any decorations after DOM replacement go here
+		}
+	];
+
+	// call this to set the panel in the app, this performs some additional things & adds common transitions
+	var setPanel = function(panel, data, oncomplete) {
+		var decorate = function($base) {
+			for(var i = 0; i < decorations.length; i++) {
+				decorations[i]($base);
+			}
+		};
+		var html = panel($.extend({translations: translations, baseUrl: jenkins.baseUrl}, data));
+		if(panel === currentPanel) { // just replace id-marked elements
+			var $upd = $(html);
+			$upd.find('*[id]').each(function() {
+				var $el = $(this);
+				var $existing = $('#'+$el.attr('id'));
+				if($existing.length > 0) {
+					if($el[0].outerHTML !== $existing[0].outerHTML) {
+						$existing.replaceWith($el);
+						decorate($el);
+					}
+				}
+			});
+
+			if(oncomplete) {
+				oncomplete();
+			}
+		}
+		else {
+			var append = function() {
+				currentPanel = panel;
+				$container.append(html);
+				decorate($container);
+				
+				var $modalHeader = $container.find('.modal-header');
+				if($modalHeader.length > 0) {
+					$modalHeader.prepend(
+						'<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
+				}
+
+				if(oncomplete) {
+					oncomplete();
+				}
+			};
+			var $modalBody = $container.find('.modal-body');
+			if($modalBody.length > 0) {
+				$modalBody.stop(true).fadeOut(250, function() {
+					$container.children().remove();
+					append();
+				});
+			}
+			else {
+				$container.children().remove();
+				append();
+			}
+		}
+	};
+
+	// plugin data for the progress panel
+	var installingPlugins = [];
+	var getInstallingPlugin = function(plugName) {
+		for(var i = 0; i < installingPlugins.length; i++) {
+			var p = installingPlugins[i];
+			if(p.name === plugName) {
+				return p;
+			}
+		}
+		return null;
+	};
+
+	// recursively get all the dependencies for a particular plugin, this is used to show 'installing' status
+	// when only dependencies are being installed
+	var getAllDependencies = function(pluginName, deps) {
+		if(!deps) { // don't get stuck
+			deps = [];
+			getAllDependencies(pluginName, deps);
+			return deps;
+		}
+		if(deps.indexOf(pluginName) >= 0) {
+			return;
+		}
+		deps.push(pluginName);
+
+		var plug = availablePlugins[pluginName];
+		if(plug) {
+			if(plug.dependencies) {
+				// plug.dependencies is  { "some-plug": "1.2.99", ... }
+				for(var k in plug.dependencies) {
+					getAllDependencies(k, deps);
+				}
+			}
+			if(plug.neededDependencies) {
+				// plug.neededDependencies is [ { name: "some-plug", ... }, ... ]
+				for(var i = 0; i < plug.neededDependencies.length; i++) {
+					getAllDependencies(plug.neededDependencies[i].name, deps);
+				}
+			}
+		}
+	};
+
+	// Initializes the set of installing plugins with pending statuses
+	var initInstallingPluginList = function() {
+		installingPlugins = [];
+		for (var i = 0; i < selectedPluginNames.length; i++) {
+			var pluginName = selectedPluginNames[i];
+			var p = availablePlugins[pluginName];
+			if (p) {
+				var plug = $.extend({
+					installStatus : 'pending'
+				}, p);
+				installingPlugins.push(plug);
+			}
+		}
+	};
+
+	// call this to go install the selected set of plugins
+	var installPlugins = function(pluginNames) {
+		// make sure to have the correct list of selected plugins
+		selectedPluginNames = pluginNames;
+		// Switch to the right view but function() to force update when progressPanel re-rendered
+		setPanel(function() { return progressPanel(arguments); }, { installingPlugins : [] });
+
+		pluginManager.installPlugins(pluginNames, handleGenericError(function() {
+			showInstallProgress();
+		}));
+	};
+	
+	// toggles visibility of dependency listing for a plugin
+	var toggleDependencyList = function() {
+		var $btn = $(this);
+		var $toggle = $btn.parents('.plugin:first');
+		var plugName = $btn.attr('data-plugin-name');
+		if(!visibleDependencies[plugName]) {
+			visibleDependencies[plugName] = true;
+		}
+		else {
+			visibleDependencies[plugName] = false;
+		}
+		if(!visibleDependencies[plugName]) {
+			$toggle.removeClass('show-dependencies');
+		}
+		else {
+			$toggle.addClass('show-dependencies');
+		}
+	};
+
+	// install the default plugins
+	var installDefaultPlugins = function() {
+		loadPluginData(function() {
+			installPlugins(pluginManager.recommendedPluginNames());
+		});
+	};
+
+	// Define actions
+	var showInstallProgress = function(state) {
+		if(state) {
+			if(/CREATE_ADMIN_USER/.test(state)) {
+				setupFirstUser();
+				return;
+			}
+		}
+
+		initInstallingPluginList();
+		setPanel(progressPanel, { installingPlugins : installingPlugins });
+
+		// call to the installStatus, update progress bar & plugin details; transition on complete
+		var updateStatus = function() {
+			pluginManager.installStatus(handleGenericError(function(data) {
+				var jobs = data.jobs;
+				
+				var i, j;
+				var complete = 0;
+				var total = 0;
+				var restartRequired = false;
+
+				for(i = 0; i < jobs.length; i++) {
+					j = jobs[i];
+					total++;
+					if(/.*Success.*/.test(j.installStatus) || /.*Fail.*/.test(j.installStatus)) {
+						complete++;
+					}
+				}
+
+				if(total === 0) { // don't end while there are actual pending plugins
+					total = installingPlugins.length;
+				}
+
+				// update progress bar
+				$('.progress-bar').css({width: ((100.0 * complete)/total) + '%'});
+
+				// update details
+				var $c = $('.install-text');
+				$c.children().remove();
+
+				for(i = 0; i < jobs.length; i++) {
+					j = jobs[i];
+					var txt = false;
+					var state = false;
+					if('true' === j.requiresRestart) {
+						restartRequired = true;
+					}
+
+					if(/.*Success.*/.test(j.installStatus)) {
+						txt = j.title;
+						state = 'success';
+					}
+					else if(/.*Install.*/.test(j.installStatus)) {
+						txt = j.title;
+						state = 'installing';
+					}
+					else if(/.*Fail.*/.test(j.installStatus)) {
+						txt = j.title;
+						state = 'fail';
+					}
+
+					if(txt && state) {
+						for(var installingIdx = 0; installingIdx < installingPlugins.length; installingIdx++) {
+							var installing = installingPlugins[installingIdx];
+							if(installing.name === j.name) {
+								installing.installStatus = state;
+							}
+							else if(installing.installStatus === 'pending' && // if no progress
+									installing.allDependencies.indexOf(j.name) >= 0 && // and we have a dependency
+									('installing' === state || 'success' === state)) { // installing or successful
+								installing.installStatus = 'installing'; // show this is installing
+							}
+						}
+
+						var isSelected = selectedPluginNames.indexOf(j.name) < 0 ? false : true;
+						var $div = $('<div>'+txt+'</div>');
+						if(isSelected) {
+							$div.addClass('selected');
+						}
+						else {
+							$div.addClass('dependent');
+						}
+						$c.append($div);
+
+						var $itemProgress = $('.selected-plugin[id="installing-' + jenkins.idIfy(j.name) + '"]');
+						if($itemProgress.length > 0 && !$itemProgress.is('.'+state)) {
+							$itemProgress.addClass(state);
+						}
+					}
+				}
+
+				$c = $('.install-console-scroll');
+				if($c.is(':visible')) {
+					$c.scrollTop($c[0].scrollHeight);
+				}
+
+				// keep polling while install is running
+				if(complete < total) {
+					setPanel(progressPanel, { installingPlugins : installingPlugins });
+					// wait a sec
+					setTimeout(updateStatus, 250);
+				}
+				else {
+					// mark complete
+					$('.progress-bar').css({width: '100%'});
+					setupFirstUser();
+				}
+			}));
+		};
+
+		// kick it off
+		setTimeout(updateStatus, 250);
+	};
+
+	// Called to complete the installation
+	var finishInstallation = function() {
+		closeInstaller();
+	};
+
+	// load the plugin data, callback
+	var loadPluginData = function(oncomplete) {
+		pluginManager.availablePlugins(handleGenericError(function(availables) {
+			var i, plug;
+			for(i = 0; i < availables.length; i++) {
+				plug = availables[i];
+				availablePlugins[plug.name] = plug;
+			}
+			for(i = 0; i < availables.length; i++) {
+				plug = availables[i];
+				plug.allDependencies = getAllDependencies(plug.name);
+			}
+			oncomplete();
+		}));
+	};
+
+	// load the custom plugin panel, will result in an AJAX call to get the plugin data
+	var loadCustomPluginPanel = function() {
+		loadPluginData(function() {
+			categories = [];
+			for(var i = 0; i < pluginList.length; i++) {
+				var a = pluginList[i];
+				categories.push(a.category);
+				var plugs = categorizedPlugins[a.category] = [];
+				for(var c = 0; c < a.plugins.length; c++) {
+					var plugInfo = a.plugins[c];
+					var plug = availablePlugins[plugInfo.name];
+					if(!plug) {
+						plug = {
+							name: plugInfo.name,
+							title: plugInfo.name
+						};
+					}
+					plugs.push({
+						category: a.category,
+						plugin: $.extend({}, plug, {
+							usage: plugInfo.usage,
+							title: plugInfo.title ? plugInfo.title : plug.title,
+							excerpt: plugInfo.excerpt ? plugInfo.excerpt : plug.excerpt,
+							updated: new Date(plug.buildDate)
+						})
+					});
+				}
+			}
+			setPanel(pluginSelectionPanel, pluginSelectionPanelData(), function() {
+				$bs('.plugin-selector .plugin-list').scrollspy({ target: '.plugin-selector .categories' });
+			});
+		});
+	};
+
+	// get plugin selection panel data object
+	var pluginSelectionPanelData = function() {
+		return {
+			categories: categories,
+			categorizedPlugins: categorizedPlugins,
+			selectedPlugins: selectedPluginNames
+		};
+	};
+
+	// remove a plugin from the selected list
+	var removePlugin = function(arr, item) {
+		for (var i = arr.length; i--;) {
+			if (arr[i] === item) {
+				arr.splice(i, 1);
+			}
+		}
+	};
+
+	// add a plugin to the selected list
+	var addPlugin = function(arr, item) {
+		arr.push(item);
+	};
+
+	// refreshes the plugin selection panel; call this if anything changes to ensure everything is kept in sync
+	var refreshPluginSelectionPanel = function() {
+		setPanel(pluginSelectionPanel, pluginSelectionPanelData());
+		if(lastSearch !== '') {
+			searchForPlugins(lastSearch, false);
+		}
+	};
+
+	// handle clicking an item in the plugin list
+	$wizard.on('change', '.plugin-list input[type=checkbox]', function() {
+		var $input = $(this);
+		if($input.is(':checked')) {
+			addPlugin(selectedPluginNames, $input.attr('name'));
+		}
+		else {
+			removePlugin(selectedPluginNames, $input.attr('name'));
+		}
+
+		refreshPluginSelectionPanel();
+	});
+
+	// walk the elements and search for the text
+	var walk = function(elements, element, text, xform) {
+		var i, child, n= element.childNodes.length;
+		for (i = 0; i<n; i++) {
+			child = element.childNodes[i];
+			if (child.nodeType===3 && xform(child.data).indexOf(text)!==-1) {
+				elements.push(element);
+				break;
+			}
+		}
+		for (i = 0; i<n; i++) {
+			child = element.childNodes[i];
+			if (child.nodeType === 1) {
+				walk(elements, child, text, xform);
+			}
+		}
+	};
+
+	// find elements matching the given text, optionally transforming the text before match (e.g. you can .toLowerCase() it)
+	var findElementsWithText = function(ancestor, text, xform) {
+		var elements= [];
+		walk(elements, ancestor, text, xform ? xform : function(d){ return d; });
+		return elements;
+	};
+
+	// search UI vars
+	var findIndex = 0;
+	var lastSearch = '';
+
+	// scroll to the next match
+	var scrollPlugin = function($pl, matches, term) {
+		if(matches.length > 0) {
+			if(lastSearch !== term) {
+				findIndex = 0;
+			}
+			else {
+				findIndex = (findIndex+1) % matches.length;
+			}
+			var $el = $(matches[findIndex]);
+			$el = $el.parents('.plugin:first'); // scroll to the block
+			if($el && $el.length > 0) {
+				var pos = $pl.scrollTop() + $el.position().top;
+				$pl.stop(true).animate({
+					scrollTop: pos
+				}, 100);
+				setTimeout(function() { // wait for css transitions to finish
+					var pos = $pl.scrollTop() + $el.position().top;
+					$pl.stop(true).animate({
+						scrollTop: pos
+					}, 50);
+				}, 50);
+			}
+		}
+	};
+
+	// search for given text, optionally scroll to the next match, set classes on appropriate elements from the search match
+	var searchForPlugins = function(text, scroll) {
+		var $pl = $('.plugin-list');
+		var $containers = $pl.find('.plugin');
+
+		// must always do this, as it's called after refreshing the panel (e.g. check/uncheck plugs)
+		$containers.removeClass('match');
+		$pl.find('h2').removeClass('match');
+
+		if(text.length > 1) {
+			if(text === 'show:selected') {
+				$('.plugin-list .selected').addClass('match');
+			}
+			else {
+				var matches = [];
+				$containers.find('.title,.description').each(function() {
+					var localMatches = findElementsWithText(this, text.toLowerCase(), function(d) { return d.toLowerCase(); });
+					if(localMatches.length > 0) {
+						matches = matches.concat(localMatches);
+					}
+				});
+				$(matches).parents('.plugin').addClass('match');
+				if(lastSearch !== text && scroll) {
+					scrollPlugin($pl, matches, text);
+				}
+			}
+			$('.match').parent().prev('h2').addClass('match');
+			$pl.addClass('searching');
+		}
+		else {
+			findIndex = 0;
+			$pl.removeClass('searching');
+		}
+		lastSearch = text;
+	};
+
+	// handle input for the search here
+	$wizard.on('keyup change', '.plugin-select-controls input[name=searchbox]', function() {
+		var val = $(this).val();
+		searchForPlugins(val, true);
+	});
+
+	// handle clearing the search
+	$wizard.on('click', '.clear-search', function() {
+		$('input[name=searchbox]').val('');
+		searchForPlugins('', false);
+	});
+
+	// toggles showing the selected items as a simple search
+	var toggleSelectedSearch = function() {
+		var $srch = $('input[name=searchbox]');
+		var val = 'show:selected';
+		if($srch.val() === val) {
+			val = '';
+		}
+		$srch.val(val);
+		searchForPlugins(val, false);
+	};
+
+	// handle clicking on the category
+	var selectCategory = function() {
+		$('input[name=searchbox]').val('');
+		searchForPlugins('', false);
+		var $el = $($(this).attr('href'));
+		var $pl = $('.plugin-list');
+		var top = $pl.scrollTop() + $el.position().top;
+		$pl.stop(true).animate({
+			scrollTop: top
+		}, 250, function() {
+			var top = $pl.scrollTop() + $el.position().top;
+			$pl.stop(true).scrollTop(top);
+		});
+	};
+
+	// handle show/hide details during the installation progress panel
+	var toggleInstallDetails = function() {
+		var $c = $('.install-console');
+		if($c.is(':visible')) {
+			$c.slideUp();
+		}
+		else {
+			$c.slideDown();
+		}
+	};
+	
+	var enableButtonsAfterFrameLoad = function() {
+		$('iframe[src]').load(function() {
+			$('button').prop({disabled:false});
+		});
+	};
+	
+	var setupFirstUser = function() {
+		setPanel(firstUserPanel, {}, enableButtonsAfterFrameLoad);
+	};
+	
+	// call to submit the firstuser
+	var saveFirstUser = function() {
+		$('button').prop({disabled:true});
+		var handleSubmit = function(data) {
+			if(data.status && data.status > 200) {
+				// Nothing we can really do here
+				setPanel(errorPanel, { errorMessage: data.statusText });
+				return;
+			}
+			// we get 200 OK
+			var $page = $(data);
+			var $errors = $page.find('.error');
+			if($errors.length > 0) {
+				var $main = $page.find('#main-panel').detach();
+				if($main.length > 0) {
+					data = data.replace(/body([^>]*)[>](.|[\r\n])+[<][/]body/,'body$1>'+$main.html()+'</body');
+				}
+				var doc = $('iframe[src]').contents()[0];
+				doc.open();
+				doc.write(data);
+				doc.close();
+			}
+			else {
+				setPanel(setupCompletePanel);
+			}
+		};
+		securityConfig.saveFirstUser($('iframe[src]').contents().find('form:not(.no-json)'), handleSubmit, handleSubmit);
+	};
+	
+	var skipFirstUser = function() {
+		$('button').prop({disabled:true});
+		setPanel(setupCompletePanel, {message: translations.installWizard_firstUserSkippedMessage});
+	};
+	
+	// call to setup the proxy
+	var setupProxy = function() {
+		setPanel(proxyConfigPanel, {}, enableButtonsAfterFrameLoad);
+	};
+	
+	// Save the proxy config
+	var saveProxyConfig = function() {
+		securityConfig.saveProxy($('iframe[src]').contents().find('form:not(.no-json)'), function() {
+			jenkins.goTo('/'); // this will re-run connectivity test
+		});
+	};
+	
+	// Call this to resume an installation after restart
+	var resumeInstallation = function() {
+		// don't re-initialize installing plugins
+		initInstallingPluginList = function() { };
+		selectedPluginNames = [];
+		for(var i = 0; i < installingPlugins.length; i++) {
+			var plug = installingPlugins[i];
+			if(plug.installStatus === 'pending') {
+				selectedPluginNames.push(plug.name);
+			}
+		}
+		installPlugins(selectedPluginNames);
+	};
+
+	// restart jenkins
+	var restartJenkins = function() {
+		pluginManager.restartJenkins(function() {
+			setPanel(loadingPanel);
+
+			console.log('-------------------');
+			console.log('Waiting for Jenkins to come back online...');
+			console.log('-------------------');
+			var pingUntilRestarted = function() {
+				pluginManager.isRestartRequired(function(isRequired) {
+					if(this.isError || isRequired) {
+						console.log('Waiting...');
+						setTimeout(pingUntilRestarted, 1000);
+					}
+					else {
+						jenkins.goTo('/');
+					}
+				});
+			};
+
+			pingUntilRestarted();
+		});
+	};
+
+	// close the installer, mark not to show again
+	var closeInstaller = function() {
+		pluginManager.completeInstall(handleGenericError(function() {
+			jenkins.goTo('/');
+		}));
+	};
+	
+	var startOver = function() {
+		jenkins.goTo('/');
+	};
+
+	// scoped click handler, prevents default actions automatically
+	var bindClickHandler = function(cls, action) {
+		$wizard.on('click', cls, function(e) {
+			action.apply(this, arguments);
+			e.preventDefault();
+		});
+	};
+
+	// click action mappings
+	var actions = {
+		'.toggle-dependency-list': toggleDependencyList,
+		'.install-recommended': installDefaultPlugins,
+		'.install-custom': loadCustomPluginPanel,
+		'.install-home': function() { setPanel(welcomePanel); },
+		'.install-selected': function() { installPlugins(selectedPluginNames); },
+		'.toggle-install-details': toggleInstallDetails,
+		'.install-done': finishInstallation,
+		'.plugin-select-all': function() { selectedPluginNames = allPluginNames; refreshPluginSelectionPanel(); },
+		'.plugin-select-none': function() { selectedPluginNames = []; refreshPluginSelectionPanel(); },
+		'.plugin-select-recommended': function() { selectedPluginNames = pluginManager.recommendedPluginNames(); refreshPluginSelectionPanel(); },
+		'.plugin-show-selected': toggleSelectedSearch,
+		'.select-category': selectCategory,
+		'.close': closeInstaller,
+		'.resume-installation': resumeInstallation,
+		'.install-done-restart': restartJenkins,
+		'.save-first-user:not([disabled])': saveFirstUser,
+		'.skip-first-user': skipFirstUser,
+		'.show-proxy-config': setupProxy,
+		'.save-proxy-config': saveProxyConfig,
+		'.skip-plugin-installs': function() { installPlugins([]); },
+		'.start-over': startOver
+	};
+	for(var cls in actions) {
+		bindClickHandler(cls, actions[cls]);
+	}
+
+	// do this so the page isn't blank while doing connectivity checks and other downloads
+	setPanel(loadingPanel);
+
+	// kick off to get resource bundle
+	jenkins.loadTranslations('jenkins.install.pluginSetupWizard', handleGenericError(function(localizations) {
+		translations = localizations;
+
+		// check for connectivity
+		jenkins.testConnectivity(handleGenericError(function(isConnected) {
+			if(!isConnected) {
+				setPanel(offlinePanel);
+				return;
+			}
+
+			// check for updates when first loaded...
+			pluginManager.installStatus(handleGenericError(function(data) {
+				var jobs = data.jobs;
+				
+				if(jobs.length > 0) {
+					if (installingPlugins.length === 0) {
+						// This can happen on a page reload if we are in the middle of
+						// an install. So, lets get a list of plugins being installed at the
+						// moment and use that as the "selectedPlugins" list.
+						selectedPluginNames = [];
+						loadPluginData(handleGenericError(function() {
+							for (var i = 0; i < jobs.length; i++) {
+								// If the job does not have a 'correlationId', then it was not selected
+								// by the user for install i.e. it's probably a dependency plugin.
+								if (jobs[i].correlationId) {
+									selectedPluginNames.push(jobs[i].name);
+								}
+							}
+						showInstallProgress(data.state);
+						}));
+					} else {
+						showInstallProgress(data.state);
+					}
+					return;
+				}
+
+				// check for crash/restart with uninstalled initial plugins
+				pluginManager.incompleteInstallStatus(handleGenericError(function(incompleteStatus) {
+					var incompletePluginNames = [];
+					for(var plugName in incompleteStatus) {
+						incompletePluginNames.push(plugName);
+					}
+
+					if(incompletePluginNames.length > 0) {
+						selectedPluginNames = incompletePluginNames;
+						loadPluginData(handleGenericError(function() {
+							initInstallingPluginList();
+
+							for(var plugName in incompleteStatus) {
+								var j = getInstallingPlugin(plugName);
+								
+								if (!j) {
+									console.warn('Plugin "' + plugName + '" not found in the list of installing plugins.');
+									continue;
+								}
+
+								var txt = false;
+								var state = false;
+								var status = incompleteStatus[plugName];
+
+								if(/.*Success.*/.test(status)) {
+									txt = j.title;
+									state = 'success';
+								}
+								else if(/.*Install.*/.test(status)) {
+									txt = j.title;
+									state = 'pending';
+								}
+								else if(/.*Fail.*/.test(status)) {
+									txt = j.title;
+									state = 'fail';
+								}
+
+								if(state) {
+									j.installStatus = state;
+								}
+							}
+							setPanel(incompleteInstallationPanel, { installingPlugins : installingPlugins });
+						}));
+						return;
+					}
+
+					// finally,  show the installer
+					// If no active install, by default, we'll show the welcome screen
+					setPanel(welcomePanel);
+
+					// focus on default
+					$('.install-recommended').focus();
+
+				}));
+			}));
+		}));
+	}));
+};
+
+// export wizard creation method
+exports.init = createPluginSetupWizard;
diff --git a/war/src/main/js/templates/errorPanel.hbs b/war/src/main/js/templates/errorPanel.hbs
new file mode 100644
index 0000000000..42cb0a69f1
--- /dev/null
+++ b/war/src/main/js/templates/errorPanel.hbs
@@ -0,0 +1,16 @@
+<div class="modal-header">
+	<h4 class="modal-title">Error</h4>
+</div>
+<div class="modal-body">
+	<div class="container error-container" id="error-message">
+		<h1>{{translations.installWizard_error_header}}</h1>
+		<div class="alert alert-danger fade in">
+			{{errorMessage}}
+		</div>
+	</div>
+</div>
+<div class="modal-footer">
+	<button type="button" class="btn btn-primary start-over">
+		{{translations.installWizard_retry}}
+	</button>
+</div>
diff --git a/war/src/main/js/templates/firstUserPanel.hbs b/war/src/main/js/templates/firstUserPanel.hbs
new file mode 100644
index 0000000000..aeb3b9627c
--- /dev/null
+++ b/war/src/main/js/templates/firstUserPanel.hbs
@@ -0,0 +1,16 @@
+<div class="modal-header">
+	<h4 class="modal-title">{{translations.installWizard_addFirstUser_title}}</h4>
+</div>
+<div class="modal-body">
+	<div class="jumbotron welcome-panel security-panel">
+		<iframe src="{{baseUrl}}/setupWizard/setupWizardFirstUser"></iframe>
+	</div>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-link skip-first-user" disabled>
+        {{translations.installWizard_skipFirstUser}}
+    </button>
+	<button type="button" class="btn btn-primary save-first-user" disabled>
+		{{translations.installWizard_saveFirstUser}}
+	</button>
+</div>
diff --git a/war/src/main/js/templates/incompleteInstallationPanel.hbs b/war/src/main/js/templates/incompleteInstallationPanel.hbs
new file mode 100644
index 0000000000..10268a1037
--- /dev/null
+++ b/war/src/main/js/templates/incompleteInstallationPanel.hbs
@@ -0,0 +1,23 @@
+<div class="modal-header">
+	<h4 class="modal-title">{{translations.installWizard_installIncomplete_title}}</h4>
+</div>
+<div class="modal-body">
+	<div class="jumbotron welcome-panel success-panel">
+		<h1>{{translations.installWizard_installIncomplete_banner}}</h1>
+		<p>{{translations.installWizard_installIncomplete_message}}</p>
+	</div>
+
+	<div class="selected-plugin-progress success-panel">
+		{{#each installingPlugins}}
+		<div class="selected-plugin {{installStatus}}" data-name="{{id name}}">{{title}}</div>
+		{{/each}}
+	</div>
+</div>
+<div class="modal-footer">
+	<button type="button" class="btn btn-link install-home">
+		{{translations.installWizard_goBack}}
+	</button>
+	<button type="button" class="btn btn-primary resume-installation">
+		{{translations.installWizard_installIncomplete_resumeInstallationButtonLabel}}
+	</button>
+</div>
\ No newline at end of file
diff --git a/war/src/main/js/templates/loadingPanel.hbs b/war/src/main/js/templates/loadingPanel.hbs
new file mode 100644
index 0000000000..dfed339ea9
--- /dev/null
+++ b/war/src/main/js/templates/loadingPanel.hbs
@@ -0,0 +1 @@
+<div class="loader"></div>
diff --git a/war/src/main/js/templates/offlinePanel.hbs b/war/src/main/js/templates/offlinePanel.hbs
new file mode 100644
index 0000000000..d10d78a444
--- /dev/null
+++ b/war/src/main/js/templates/offlinePanel.hbs
@@ -0,0 +1,13 @@
+<div class="modal-header">
+    <h4 class="modal-title">{{translations.installWizard_offline_title}}</h4>
+</div>
+<div class="modal-body">
+    <div class="jumbotron welcome-panel offline">
+        <h1>{{translations.installWizard_offline_title}}</h1>
+        <p>{{{translations.installWizard_offline_message}}}</p>
+        <p>
+            <button type="button" class="btn btn-primary show-proxy-config">{{translations.installWizard_configureProxy_label}}</button>
+            <button type="button" class="btn btn-primary skip-plugin-installs">{{translations.installWizard_skipPluginInstallations}}</button>
+        </p>
+    </div>
+</div>
diff --git a/war/src/main/js/templates/pluginSelectionPanel.hbs b/war/src/main/js/templates/pluginSelectionPanel.hbs
new file mode 100644
index 0000000000..addd570e56
--- /dev/null
+++ b/war/src/main/js/templates/pluginSelectionPanel.hbs
@@ -0,0 +1,71 @@
+<div class="modal-header">
+	<h4 class="modal-title">{{translations.installWizard_installCustom_title}}</h4>
+</div>
+<div class="modal-body plugin-selector">
+	<div class="categories col-sm-3">
+	<ul class="nav">
+	  {{#each categories}}
+	  <li><a href="#{{id this}}" class="select-category">{{this}}</a></li>
+	  {{/each}}
+	</ul>
+	</div>
+	<div class="plugins col-sm-9">
+		<div class="plugin-select-controls">
+			<span class="plugin-select-actions">
+				<a href="#" class="plugin-select-all">{{translations.installWizard_installCustom_selectAll}}</a>
+				<a href="#" class="plugin-select-none">{{translations.installWizard_installCustom_selectNone}}</a>
+				<a href="#" class="plugin-select-recommended">{{translations.installWizard_installCustom_selectRecommended}}</a>
+			</span>
+			<span class="plugin-search-controls">
+				<input type="text" name="searchbox" class="form-control" />
+				<a href="#" class="clear-search">&times;</a>
+			</span>
+			<span id="plugin-selected-info" class="plugin-selected-info" data-selected-plugins="{{#each selectedPlugins}}{{this}},{{/each}}">
+				<a href="#" class="plugin-show-selected">{{translations.installWizard_installCustom_selected}}</a> {{totalPluginCount}}
+			</span>
+		</div>
+		<div class="plugin-list">
+			<div class="plugin-list-description">{{{translations.installWizard_installCustom_pluginListDesc}}}</div>
+			{{#each categorizedPlugins}}
+			<h2 id="{{id @key}}" class="expanded">{{@key}} {{pluginCountForCategory @key}}</h2>
+			<div class="plugins-for-category">
+				{{#each this}}
+				<div class="plugin {{#inSelectedPlugins plugin.name}}selected{{/inSelectedPlugins}} {{#ifVisibleDependency plugin.name}}show-dependencies{{/ifVisibleDependency}}" id="row-{{plugin.name}}">
+					{{#hasDependencies plugin.name}}
+						<div class="btn btn-link toggle-dependency-list" type="button" data-plugin-name="{{../plugin.name}}">
+							{{../../../translations.installWizard_installIncomplete_dependenciesLabel}}<span class="badge">{{dependencyCount ../plugin.name}}</span>
+						</div>
+					{{/hasDependencies}}
+					<label>
+						<span class="title">
+							<input type="checkbox" id="chk-{{plugin.name}}" name="{{plugin.name}}" value="{{searchTerm}}" {{#inSelectedPlugins plugin.name}}checked="checked"{{/inSelectedPlugins}}/>
+							{{plugin.title}}
+						</span>
+						<span class="description">
+							{{{plugin.excerpt}}}
+						</span>
+						{{#hasDependencies plugin.name}}
+							<div class="dep-list">
+								{{#eachDependency ../plugin.name}}
+								<span class="dep badge">
+								{{title}}
+								</span>
+								{{/eachDependency}}
+							</div>
+						{{/hasDependencies}}
+					</label>
+				</div>
+				{{/each}}
+			</div>
+			{{/each}}
+		</div>
+	</div>
+</div>
+<div class="modal-footer">
+	<button type="button" class="btn btn-link install-home">
+		{{translations.installWizard_goBack}}
+	</button>
+	<button type="button" class="btn btn-primary install-selected">
+		{{translations.installWizard_goInstall}}
+	</button>
+</div>
diff --git a/war/src/main/js/templates/pluginSetupWizard.hbs b/war/src/main/js/templates/pluginSetupWizard.hbs
new file mode 100644
index 0000000000..0eca05b4e3
--- /dev/null
+++ b/war/src/main/js/templates/pluginSetupWizard.hbs
@@ -0,0 +1,7 @@
+<div class="plugin-setup-wizard bootstrap-3">
+	<div class="modal fade in" style="display: block;">
+		<div class="modal-dialog">
+			<div class="modal-content"></div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/war/src/main/js/templates/progressPanel.hbs b/war/src/main/js/templates/progressPanel.hbs
new file mode 100644
index 0000000000..49df7f81ae
--- /dev/null
+++ b/war/src/main/js/templates/progressPanel.hbs
@@ -0,0 +1,26 @@
+<div class="modal-header">
+	<h4 class="modal-title">{{translations.installWizard_installing_title}}</h4>
+</div>
+<div class="modal-body installing-body">
+	<div class="jumbotron welcome-panel installing-panel">
+		<h1>{{translations.installWizard_installing_title}}</h1>
+		<div class="progress">
+		  <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
+		    <span class="sr-only">{{translations.installWizard_installing_title}}</span>
+		  </div>
+		</div>
+	</div>
+
+	<div class="selected-plugin-progress">
+		{{#each installingPlugins}}
+		<div class="selected-plugin {{installStatus}}" id="installing-{{id name}}" data-tooltip="{{errorMessage}}">{{title}}</div>
+		{{/each}}
+	</div>
+
+	<div class="install-console">
+	  <div class="install-console-scroll">
+	    <div class="install-text"></div>
+	  </div>
+	  <div class="dependency-legend">{{translations.installWizard_installingConsole_dependencyIndicatorNote}}</div>
+	</div>
+</div>
diff --git a/war/src/main/js/templates/proxyConfigPanel.hbs b/war/src/main/js/templates/proxyConfigPanel.hbs
new file mode 100644
index 0000000000..ac4b259bb0
--- /dev/null
+++ b/war/src/main/js/templates/proxyConfigPanel.hbs
@@ -0,0 +1,16 @@
+<div class="modal-header">
+    <h4 class="modal-title">{{translations.installWizard_configureProxy_label}}</h4>
+</div>
+<div class="modal-body">
+    <div class="jumbotron welcome-panel security-panel">
+        <iframe src="{{baseUrl}}/setupWizard/proxy-configuration"></iframe>
+    </div>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-link install-home">
+        {{translations.installWizard_goBack}}
+    </button>
+    <button type="button" class="btn btn-primary save-proxy-config" disabled>
+        {{translations.installWizard_configureProxy_save}}
+    </button>
+</div>
diff --git a/war/src/main/js/templates/setupCompletePanel.hbs b/war/src/main/js/templates/setupCompletePanel.hbs
new file mode 100644
index 0000000000..7527af4eaa
--- /dev/null
+++ b/war/src/main/js/templates/setupCompletePanel.hbs
@@ -0,0 +1,22 @@
+<div class="modal-header">
+	<h4 class="modal-title">{{translations.installWizard_installComplete_title}}</h4>
+</div>
+<div class="modal-body">
+	<div class="jumbotron welcome-panel success-panel">
+		<h1>{{translations.installWizard_installComplete_banner}}</h1>
+		
+		{{{message}}}
+
+		{{#if restartRequired}}
+		<p>{{translations.installWizard_installComplete_message}} {{translations.installWizard_installComplete_restartRequiredMessage}}</p>
+		<button type="button" class="btn btn-primary install-done-restart">
+			{{translations.installWizard_installComplete_restartLabel}}
+		</button>
+		{{else}}
+		<p>{{translations.installWizard_installComplete_message}}</p>
+		<button type="button" class="btn btn-primary install-done">
+			{{translations.installWizard_installComplete_finishButtonLabel}}
+		</button>
+		{{/if}}
+	</div>
+</div>
diff --git a/war/src/main/js/templates/successPanel.hbs b/war/src/main/js/templates/successPanel.hbs
new file mode 100644
index 0000000000..6efbe9d369
--- /dev/null
+++ b/war/src/main/js/templates/successPanel.hbs
@@ -0,0 +1,26 @@
+<div class="modal-header">
+	<h4 class="modal-title">{{translations.installWizard_pluginsInstalled_title}}</h4>
+</div>
+<div class="modal-body">
+	<div class="jumbotron welcome-panel success-panel">
+		<h1>{{translations.installWizard_pluginsInstalled_banner}}</h1>
+
+		{{#if restartRequired}}
+		<p>{{translations.installWizard_installComplete_message}} {{translations.installWizard_installComplete_restartRequiredMessage}}</p>
+		<button type="button" class="btn btn-primary install-done-restart">
+			{{translations.installWizard_installComplete_restartLabel}}
+		</button>
+		{{else}}
+		<p>{{translations.installWizard_installComplete_message}}</p>
+		<button type="button" class="btn btn-primary install-done">
+			{{translations.installWizard_installComplete_finishButtonLabel}}
+		</button>
+		{{/if}}
+	</div>
+
+	<div class="selected-plugin-progress success-panel">
+		{{#each installingPlugins}}
+		<div class="selected-plugin {{installStatus}}" data-name="{{id name}}">{{title}}</div>
+		{{/each}}
+	</div>
+</div>
diff --git a/war/src/main/js/templates/welcomePanel.hbs b/war/src/main/js/templates/welcomePanel.hbs
new file mode 100644
index 0000000000..5aa5742756
--- /dev/null
+++ b/war/src/main/js/templates/welcomePanel.hbs
@@ -0,0 +1,30 @@
+<div class="modal-header">
+	<h4 class="modal-title">{{translations.installWizard_welcomePanel_title}}</h4>
+</div>
+<div class="modal-body">
+  <i class="water-mark icon-service"></i>
+  <div class="jumbotron welcome-panel">
+		 <h1>{{translations.installWizard_welcomePanel_banner}}</h1>
+	<p>
+			{{translations.installWizard_welcomePanel_message}}
+		</p>
+		<p class="button-set">
+			<a class="btn btn-primary btn-lg btn-huge install-recommended" href="#" role="button">
+				<b>{{translations.installWizard_welcomePanel_recommendedActionTitle}}</b>
+				<sub>
+					{{translations.installWizard_welcomePanel_recommendedActionDetails}}
+				</sub>
+				<i class="icon icon-signup"></i>
+			</a>
+
+			<a class="btn btn-default btn-lg btn-huge install-custom" href="#" role="button">
+				<b>{{translations.installWizard_welcomePanel_customizeActionTitle}}</b>
+				<sub>
+					{{translations.installWizard_welcomePanel_customizeActionDetails}}
+				</sub>
+				<i class="icon icon-plug"></i>
+			</a>
+		</p>
+	</div>
+
+</div>
diff --git a/war/src/main/js/util/behavior-shim.js b/war/src/main/js/util/behavior-shim.js
new file mode 100644
index 0000000000..27d00b784a
--- /dev/null
+++ b/war/src/main/js/util/behavior-shim.js
@@ -0,0 +1,4 @@
+
+exports.specify = function(selector, id, priority, behavior) {
+    Behaviour.specify(selector, id, priority, behavior); // jshint ignore:line
+};
\ No newline at end of file
diff --git a/war/src/main/js/util/jenkins.js b/war/src/main/js/util/jenkins.js
new file mode 100644
index 0000000000..0423f1d6a4
--- /dev/null
+++ b/war/src/main/js/util/jenkins.js
@@ -0,0 +1,276 @@
+/**
+ * Jenkins JS Modules common utility functions
+ */
+
+// Get the modules
+
+var jquery = require('jquery-detached');
+var wh = require('window-handle');
+
+var debug = false;
+
+// gets the base Jenkins URL including context path
+exports.baseUrl = function() {
+	var $ = jquery.getJQuery();
+	var u = $('head').attr('data-rooturl');
+	if(!u) {
+		u = '';
+	}
+	return u;
+};
+
+// awful hack to get around JSONifying things with Prototype taking over wrong. ugh. Prototype is the worst.
+exports.stringify = function(o) {
+	if(Array.prototype.toJSON) { // Prototype f's this up something bad
+		var protoJSON = {
+			a: Array.prototype.toJSON,
+			o: Object.prototype.toJSON,
+			h: Hash.prototype.toJSON,
+			s: String.prototype.toJSON
+		};
+		try {
+			delete Array.prototype.toJSON;
+		delete Object.prototype.toJSON;
+			delete Hash.prototype.toJSON;
+			delete String.prototype.toJSON;
+
+		return JSON.stringify(o);
+		}
+		finally {
+		if(protoJSON.a) {
+			Array.prototype.toJSON = protoJSON.a;
+		}
+		if(protoJSON.o) {
+			Object.prototype.toJSON = protoJSON.o;
+		}
+		if(protoJSON.h) {
+			Hash.prototype.toJSON = protoJSON.h;
+		}
+		if(protoJSON.s) {
+			String.prototype.toJSON = protoJSON.s;
+		}
+		}
+	}
+	else {
+		return JSON.stringify(o);
+	}
+};
+
+/**
+ * Take a string and replace non-id characters to make it a friendly-ish XML id
+ */
+exports.idIfy = function(str) {
+	return (''+str).replace(/\W+/g, '_');
+};
+
+/**
+ * redirect
+ */
+exports.goTo = function(url) {
+	wh.getWindow().location.replace(exports.baseUrl() + url);
+};
+
+/**
+ * Jenkins AJAX GET callback.
+ * If last parameter is an object, will be extended to jQuery options (e.g. pass { error: function() ... } to handle errors)
+ */
+exports.get = function(url, success, options) {
+	if(debug) {
+		console.log('get: ' + url);
+	}
+	var $ = jquery.getJQuery();
+	var args = {
+		url: exports.baseUrl() + url,
+		type: 'GET',
+		cache: false,
+		dataType: 'json',
+		success: success
+	};
+	if(options instanceof Object) {
+		$.extend(args, options);
+	}
+	$.ajax(args);
+};
+
+/**
+ * Jenkins AJAX POST callback, formats data as a JSON object post (note: works around prototype.js ugliness using stringify() above)
+ * If last parameter is an object, will be extended to jQuery options (e.g. pass { error: function() ... } to handle errors)
+ */
+exports.post = function(url, data, success, options) {
+	if(debug) {
+		console.log('post: ' + url);
+	}
+	
+	var $ = jquery.getJQuery();
+	
+	// handle crumbs
+	var headers = {};
+	var wnd = wh.getWindow();
+	var crumb;
+	if('crumb' in options) {
+		crumb = options.crumb;
+	}
+	else if('crumb' in wnd) {
+		crumb = wnd.crumb;
+	}
+	
+	if(crumb) {
+		headers[crumb.fieldName] = crumb.value;
+	}
+	
+	var formBody = data;
+	if(formBody instanceof Object) {
+		if(crumb) {
+			formBody = $.extend({}, formBody);
+			formBody[crumb.fieldName] = crumb.value;
+		}
+		formBody = exports.stringify(formBody);
+	}
+	
+	var args = {
+		url: exports.baseUrl() + url,
+		type: 'POST',
+		cache: false,
+		dataType: 'json',
+		data: formBody,
+		contentType: "application/json",
+		success: success,
+		headers: headers
+	};
+	if(options instanceof Object) {
+		$.extend(args, options);
+	}
+	$.ajax(args);
+};
+
+/**
+ *  handlebars setup, this does not seem to actually work or get called by the require() of this file, so have to explicitly call it
+ */
+exports.initHandlebars = function() {
+	var Handlebars = require('handlebars');
+
+	Handlebars.registerHelper('ifeq', function(o1, o2, options) {
+		if(o1 === o2) {
+			return options.fn();
+		}
+	});
+
+	Handlebars.registerHelper('ifneq', function(o1, o2, options) {
+		if(o1 !== o2) {
+			return options.fn();
+		}
+	});
+
+	Handlebars.registerHelper('in-array', function(arr, val, options) {
+		if(arr.indexOf(val) >= 0) {
+			return options.fn();
+		}
+	});
+
+	Handlebars.registerHelper('id', exports.idIfy);
+
+	return Handlebars;
+};
+
+/**
+ * Load translations for the given bundle ID, provide the message object to the handler.
+ * Optional error handler as the last argument.
+ */
+exports.loadTranslations = function(bundleName, handler, onError) {
+	exports.get('/i18n/resourceBundle?baseName='  +bundleName, function(res) {
+		if(res.status !== 'ok') {
+			if(onError) {
+				onError(res.message);
+			}
+			throw 'Unable to load localization data: ' + res.message;
+		}
+
+		handler(res.data);
+	});
+};
+
+/**
+ * Runs a connectivity test, calls handler with a boolean whether there is sufficient connectivity to the internet
+ */
+exports.testConnectivity = function(handler) {
+	// check the connectivity api
+	var testConnectivity = function() {
+		exports.get('/updateCenter/connectionStatus?siteId=default', function(response) {
+			var uncheckedStatuses = ['PRECHECK', 'CHECKING', 'UNCHECKED'];
+			if(uncheckedStatuses.indexOf(response.data.updatesite) >= 0  || uncheckedStatuses.indexOf(response.data.internet) >= 0) {
+				setTimeout(testConnectivity, 100);
+			}
+			else {
+				if(response.status !== 'ok' || response.data.updatesite !== 'OK' || response.data.internet !== 'OK') {
+					// no connectivity
+					handler(false);
+				}
+				else {
+					handler(true);
+				}
+			}
+		});
+	};
+	testConnectivity();
+};
+
+/**
+ * gets the window containing a form, taking in to account top-level iframes
+ */
+exports.getWindow = function($form) {
+	var $ = jquery.getJQuery();
+	$form = $($form);
+	var wnd = wh.getWindow();
+	$(top.document).find('iframe').each(function() {
+		var windowFrame = this.contentWindow;
+		var $f = $(this).contents().find('form');
+		if($f.length > 0 && $form[0] === $f[0]) {
+			wnd = windowFrame;
+		}
+	});
+	return wnd;
+};
+
+/**
+ * Builds a stapler form post
+ */
+exports.buildFormPost = function($form) {
+	var $ = jquery.getJQuery();
+	$form = $($form);
+	var wnd = exports.getWindow($form);
+	var form = $form[0];
+	if(wnd.buildFormTree(form)) {
+		return $form.serialize() +
+			'&core:apply=&Submit=Save&json=' + $form.find('input[name=json]').val();
+	}
+	return '';
+};
+
+/**
+ * Gets the crumb, if crumbs are enabled
+ */
+exports.getFormCrumb = function($form) {
+	var $ = jquery.getJQuery();
+	$form = $($form);
+	var wnd = exports.getWindow($form);
+	return wnd.crumb;
+};
+
+/**
+ * Jenkins Stapler JSON POST callback
+ * If last parameter is an object, will be extended to jQuery options (e.g. pass { error: function() ... } to handle errors)
+ */
+exports.staplerPost = function(url, $form, success, options) {
+	var $ = jquery.getJQuery();
+	$form = $($form);
+	var postBody = exports.buildFormPost($form);
+	var crumb = exports.getFormCrumb($form);
+	exports.post(
+		url,
+		postBody,
+		success, $.extend({
+			processData: false,
+			contentType: 'application/x-www-form-urlencoded',
+			crumb: crumb
+		}, options));
+};
diff --git a/war/src/main/js/util/jenkinsLocalStorage.js b/war/src/main/js/util/jenkinsLocalStorage.js
new file mode 100644
index 0000000000..44aa587fe6
--- /dev/null
+++ b/war/src/main/js/util/jenkinsLocalStorage.js
@@ -0,0 +1,32 @@
+var windowHandle = require('window-handle');
+var storage = require('./localStorage.js');
+
+/** 
+ * Store a Jenkins globally scoped value.
+ */
+exports.setGlobalItem = function(name, value) {
+    storage.setItem('jenkins:' + name, value);
+};
+
+/** 
+ * Get a Jenkins globally scoped value.
+ */
+exports.getGlobalItem = function(name, defaultVal) {
+    return storage.getItem('jenkins:' + name, defaultVal);
+};
+
+/** 
+ * Store a Jenkins page scoped value.
+ */
+exports.setPageItem = function(name, value) {
+    name = 'jenkins:' + name + ':' + windowHandle.getWindow().location.href;
+    storage.setItem(name, value);
+};
+
+/** 
+ * Get a Jenkins page scoped value.
+ */
+exports.getPageItem = function(name, defaultVal) {
+    name = 'jenkins:' + name + ':' + windowHandle.getWindow().location.href;
+    return storage.getItem(name, defaultVal);
+};
\ No newline at end of file
diff --git a/war/src/main/js/util/jquery-ext.js b/war/src/main/js/util/jquery-ext.js
new file mode 100644
index 0000000000..f7285a4c4a
--- /dev/null
+++ b/war/src/main/js/util/jquery-ext.js
@@ -0,0 +1,40 @@
+/*
+ * Some internal jQuery extensions.
+ */
+
+var jQD = require('jquery-detached');
+var $ext;
+
+exports.getJQuery = function() {
+    if (!$ext) {
+        initJQueryExt();
+    }
+    return $ext;
+};
+
+/*
+ * Clear the $ext instance if the window changes. Primarily for unit testing.
+ */
+var windowHandle = require('window-handle');
+windowHandle.getWindow(function() {
+    $ext = undefined;
+});
+
+function initJQueryExt() {
+    // We are going to be adding "stuff" to jQuery. We create a totally new jQuery instance
+    // because we do NOT want to run the risk of polluting the shared instance.
+    $ext = jQD.newJQuery();
+
+    /**
+     * A pseudo selector that performs a case insensitive text contains search i.e. the same
+     * as the standard ':contains' selector, but case insensitive.
+     */
+    $ext.expr[":"].containsci = $ext.expr.createPseudo(function (text) {
+        return function (element) {
+            var elementText = $ext(element).text();
+            var result = (elementText.toUpperCase().indexOf(text.toUpperCase()) !== -1);
+            return result;
+        };
+    });
+}
+initJQueryExt();
diff --git a/war/src/main/js/util/localStorage.js b/war/src/main/js/util/localStorage.js
new file mode 100644
index 0000000000..0628c1b547
--- /dev/null
+++ b/war/src/main/js/util/localStorage.js
@@ -0,0 +1,40 @@
+var windowHandle = require('window-handle');
+var win = windowHandle.getWindow();
+var storage = win.localStorage;
+
+exports.setMock = function() {
+    storage = {
+        storage: {},
+        setItem: function (name, value) {
+            this.storage[name] = value;
+        },
+        getItem: function (name) {
+            return this.storage[name];
+        },
+        removeItem: function (name) {
+            delete this.storage[name];
+        }
+    };
+};
+
+exports.setItem = function(name, value) {
+    storage.setItem(name, value);
+};
+
+exports.getItem = function(name, defaultVal) {
+    var value = storage.getItem(name);
+    if (!value) {
+        value = defaultVal;
+    }
+    return  value;
+};
+
+exports.removeItem = function(name) {
+    return storage.removeItem(name);
+};
+
+if (typeof storage === "undefined") {
+    console.warn('HTML5 localStorage not supported by this browser.');
+    // mock it...
+    exports.setMock();
+}
\ No newline at end of file
diff --git a/war/src/main/js/util/page.js b/war/src/main/js/util/page.js
new file mode 100644
index 0000000000..77052bb9d0
--- /dev/null
+++ b/war/src/main/js/util/page.js
@@ -0,0 +1,91 @@
+var jQD = require('jquery-detached');
+var windowHandle = require('window-handle');
+var timestamp = (new Date().getTime());
+var loadedClass = 'jenkins-loaded-' + timestamp;
+
+/**
+ * Wait for the specified element to be added to the DOM.
+ * <p>
+ * A jQuery based alternative to Behaviour.specify. Grrrr.
+ * @param selector The jQuery selector.
+ * @param callback The callback to call after finding new elements. This
+ * callback must return a boolean value of true if scanning is to continue. 
+ * @param contextEl The jQuery selector context (optional).
+ */
+exports.onload = function(selector, callback, contextEl) {
+    var $ = jQD.getJQuery();
+
+    function registerRescan() {
+        setTimeout(scan, 50);
+    }
+    function scan() {
+        var elements = $(selector, contextEl).not(loadedClass);
+        if (elements.size() > 0) {
+            elements.addClass(loadedClass);
+            if (callback(elements) === true) {
+                registerRescan();
+            }
+        } else {
+            registerRescan();
+        }
+    }
+    scan();
+};
+
+exports.winScrollTop = function() {
+    var $ = jQD.getJQuery();
+    var win = $(windowHandle.getWindow());
+    return win.scrollTop();
+};
+
+exports.onWinScroll = function(callback) {
+    var $ = jQD.getJQuery();
+    $(windowHandle.getWindow()).on('scroll', callback);
+};
+
+exports.pageHeaderHeight = function() {
+    return elementHeight('#page-head');
+};
+
+exports.breadcrumbBarHeight = function() {
+    return elementHeight('#breadcrumbBar');
+};
+
+exports.fireBottomStickerAdjustEvent = function() {
+    Event.fire(window, 'jenkins:bottom-sticker-adjust'); // jshint ignore:line
+};
+
+// YUI Drag widget does not like to work on elements with a relative position.
+// This tells the element to switch to static position at the start of the drag, so it can work.
+exports.fixDragEvent = function(handle) {
+    var $ = jQD.getJQuery();
+    var isReady = false;
+    var $handle = $(handle);
+    var $chunk = $handle.closest('.repeated-chunk');
+    $handle.add('#ygddfdiv')
+	.mousedown(function(){
+	    isReady = true;
+	})
+	.mousemove(function(){
+	    if(isReady && !$chunk.hasClass('dragging')){
+		$chunk.addClass('dragging');
+	    }
+	}).mouseup(function(){
+	    isReady = false;
+	    $chunk.removeClass('dragging');
+	});
+};
+
+exports.removeTextHighlighting = function(selector) {
+    var $ = jQD.getJQuery();
+    $('span.highlight-split', selector).each(function() {
+        var highlightSplit = $(this);
+        highlightSplit.before(highlightSplit.text());
+        highlightSplit.remove();
+    });
+};
+
+function elementHeight(selector) {
+    var $ = jQD.getJQuery();
+    return $(selector).height();
+}
\ No newline at end of file
diff --git a/war/src/main/js/widgets/add/addform.less b/war/src/main/js/widgets/add/addform.less
new file mode 100644
index 0000000000..db04a55174
--- /dev/null
+++ b/war/src/main/js/widgets/add/addform.less
@@ -0,0 +1,342 @@
+#add-item-panel {
+
+  form > .header {
+    position: relative;
+    border: 1px solid #cccccc;
+    border-bottom: none;
+    background: #eeeeee;
+    -webkit-border-top-left-radius: 3px;
+    -moz-border-top-left-radius: 3px;
+    border-top-left-radius: 3px;
+    -webkit-border-top-right-radius: 3px;
+    -moz-border-top-right-radius: 3px;
+    border-top-right-radius: 3px;
+    z-index: 5;
+  }
+
+  form > .footer {
+    position: relative;
+    border: 1px solid #cccccc;
+    border-top: none;
+    background: #eeeeee;
+    height: 110px;
+
+    .btn-decorator {
+      position: absolute;
+      bottom: -1px;
+      left: -1px;
+      padding: 20px 30px;
+      width: auto;
+      border-top-right-radius: 10px;
+      border: 1px solid #aaccbb;
+      background: rgba(245, 249, 239, 0.75);
+      text-align: center;
+
+      button[type=submit] {
+        padding: 5px 20px;
+        background-color: rgb(204, 221, 238);
+        border-color: rgb(102, 153, 204);
+        border-radius: 3px;
+        border-width: 1px;
+        border-style: solid;
+        color: rgb(80, 80, 80);
+        font-weight: bold;
+        font-size: 12px;
+        line-height: 27px;
+      }
+    }
+  }
+
+  .add-item-name {
+    padding: 20px;
+
+    label {
+      position: relative;
+      display: block;
+      font-size: 22px;
+      font-weight: bold;
+      padding-bottom: 10px;
+    }
+  }
+
+  .item-copy {
+    position: relative;
+    border: 1px solid #cccccc;
+    border-top: none;
+    padding: 20px;
+    background-color: #f9f9f9;
+
+    p.description {
+      font-size: 16px;
+      margin-top: 0;
+    }
+
+    .add-item-copy {
+      position: relative;
+      padding-left: 58px;
+
+      /* This is needed because <s:textbox /> included YUI styles and we need to override this one */
+      font-family: Helvetica, Arial, sans-serif !important;
+
+      input[type=radio] {
+        display: none;
+      }
+
+      label {
+        line-height: 48px;
+        padding: 0 10px 0 0;
+      }
+
+      input {
+        font-size: inherit;
+      }
+
+      .icon {
+        left: 0;
+        top: 0;
+      }
+    }
+  }
+
+  .add-item-name, .add-item-copy {
+    .input-help {
+      color: #666;
+      font-style: italic;
+      font-size: 13px;
+      padding-top: 2px;
+    }
+
+    .input-validation-message {
+      color: red;
+      padding-top: 2px;
+      font-weight: bold;
+    }
+
+    .input-message-disabled {
+      display: none;
+    }
+  }
+
+
+  .icon {
+    position: absolute;
+    left: 10px;
+    top: 10px;
+    height: 48px;
+    width: 48px;
+    background: #ffffff;
+    border: 1px solid #6699cc;
+    border-radius: 50%;
+    opacity: .9;
+
+    img {
+      position: relative;
+    }
+  }
+
+  .icon:before {
+    content: ' ';
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 24px;
+    border-top-left-radius: 24px;
+    border-top-right-radius: 24px;
+    background: #C0D8E2;
+  }
+
+  .default-icon {
+    position: absolute;
+    left: 10px;
+    top: 10px;
+    height: 48px;
+    width: 48px;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 48px;
+    font-weight: bold;
+    font-size: 175%;
+    color: #ffffff;
+    text-shadow: rgba(0, 0, 0, 0.25) 0 -1px 1px;
+    opacity: .75;
+
+    .b {
+      text-transform: lowercase;
+    }
+  }
+
+  .c-D33833 {
+    border: 1px solid #900;
+    box-shadow:
+      inset #900 0 0 1px,
+      inset #fff 0 0 0 1px,
+      0 5px 3px -2px rgba(0, 0, 0, 0.25),
+      inset -5px -5px 10px 2px #903,
+      inset -5px -10px 15px 14px #D33833
+  }
+
+  .c-6D6B6D {
+    border: 1px solid #000;
+    box-shadow:
+      inset #333 0 0 1px,
+      inset #fff 0 0 0 1px,
+      0 5px 3px -2px rgba(0, 0, 0, 0.25),
+      inset -5px -5px 10px 2px #222,
+      inset -5px -10px 15px 14px #555
+  }
+
+  .c-335061 {
+    border: 1px solid #356;
+    box-shadow:
+      inset #024 0 0 1px,
+      inset #fff 0 0 0 1px,
+      0 5px 3px -2px rgba(0, 0, 0, 0.25),
+      inset -5px -5px 10px 2px #012,
+      inset -5px -10px 15px 14px #335061
+  }
+
+  .c-49728B {
+    border: 1px solid #036;
+    box-shadow:
+      inset #036 0 0 1px,
+      inset #fff 0 0 0 1px,
+      0 5px 3px -2px rgba(0, 0, 0, 0.25),
+      inset -5px -5px 10px 2px #036,
+      inset -5px -10px 15px 14px #49728B
+  }
+
+  .c-6699CC {
+    border: 1px solid #6699cc;
+    box-shadow:
+      inset #003399 0 0 1px,
+      inset #ffffff 0 0 0 1px,
+      0 5px 3px -2px rgba(0, 0, 0, 0.25),
+      inset -5px -5px 10px 2px #336699,
+      inset -5px -10px 15px 14px #6699cc;
+  }
+
+  input {
+    font-size: 1.5em;
+    background-color: #fff;
+    padding: 5px 10px;
+    border: 1px solid #999;
+    width: 50%;
+    min-width: 300px;
+  }
+
+  .categories {
+    border: 1px solid #cccccc;
+    background-color: #f9f9f9;
+
+    .category {
+      border-bottom: 1px solid #cccccc;
+      padding: 10px;
+
+      .header {
+        padding: 0 20px;
+
+        h2 {
+          margin: 0;
+          padding: 15px 0 0;
+        }
+
+        p {
+          margin-top: 5px;
+        }
+      }
+    }
+
+    .category:last-child {
+      border-bottom: none;
+    }
+  }
+
+  .categories.flat {
+    .category {
+      border-bottom: none;
+
+      .header {
+        display: none;
+      }
+    }
+
+    .category:first-child {
+      padding-bottom: 0;
+    }
+
+    .category:last-child {
+      padding-top: 0;
+    }
+  }
+
+}
+
+.j-item-options li, .j-item-options {
+  display: block;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  position: relative;
+}
+
+.j-item-options {
+
+  li:hover, li:focus {
+    border-color: #cccccc;
+    background: rgba(255, 255, 255, 0.65);
+  }
+
+  li.active {
+    cursor: text;
+    background-color: #ffffff;
+    border-color: #6699cc;
+    box-shadow: inset 999rem 0 #ffffff;
+    -webkit-touch-callout: text;
+    -webkit-user-select: text;
+    -khtml-user-select: text;
+    -moz-user-select: text;
+    -ms-user-select: text;
+    user-select: text;
+    -moz-transition: .5s;
+    -webkit-transition: .5s;
+    -o-transition: .5s;
+    transition: .5s;
+
+    .icon {
+      opacity: 1
+    }
+  }
+
+  li {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    cursor: pointer;
+    border: 1px solid transparent;
+    border-radius: 3px;
+    padding: 10px 10px 10px 68px;
+    min-height: 68px;
+    margin: 2px 0;
+
+    label {
+      display: block;
+      font-size: 1.1em;
+      font-weight: bold;
+      color: #000;
+      padding-bottom: 5px;
+      cursor: pointer;
+
+      input {
+        position: absolute;
+        top: 24px;
+        left: 25px;
+        display: none;
+      }
+    }
+  }
+}
diff --git a/war/src/main/js/widgets/config/model/ConfigRowGrouping.js b/war/src/main/js/widgets/config/model/ConfigRowGrouping.js
new file mode 100644
index 0000000000..01bdda3e40
--- /dev/null
+++ b/war/src/main/js/widgets/config/model/ConfigRowGrouping.js
@@ -0,0 +1,75 @@
+var jQD = require('../../../util/jquery-ext.js');
+
+module.exports = ConfigRowGrouping;
+
+/*
+ * =======================================================================================
+ * Configuration table row grouping i.e. row-set-*, optional-block-*, radio-block-* etc
+ * 
+ * A ConfigSection maintains a list of ConfigRowGrouping and then ConfigRowGrouping
+ * itself maintains a list i.e. it's hierarchical. See ConfigSection.gatherRowGroups().
+ * =======================================================================================
+ */
+function ConfigRowGrouping(startRow, parentRowGroupContainer) {
+    this.startRow = startRow;
+    this.parentRowGroupContainer = parentRowGroupContainer;
+    this.endRow = undefined;
+    this.rows = [];
+    this.rowGroups = []; // Support groupings nested inside groupings
+    this.toggleWidget = undefined;
+    this.label = undefined;
+}
+
+ConfigRowGrouping.prototype.getRowCount = function(includeChildren) {
+    var count = this.rows.length;
+    if (includeChildren === undefined || includeChildren === true) {
+        for (var i = 0; i < this.rowGroups.length; i++) {
+            count += this.rowGroups[i].getRowCount();
+        }
+    }
+    return count;
+};
+
+ConfigRowGrouping.prototype.getLabels = function() {
+    var labels = [];
+    
+    if (this.label) {
+        labels.push(this.label);
+    }
+    for (var i = 0; i < this.rowGroups.length; i++) {
+        var rowSet = this.rowGroups[i];
+        labels.push(rowSet.getLabels());
+    }
+    return labels;
+};
+
+ConfigRowGrouping.prototype.updateVisibility = function() {
+    if (this.toggleWidget !== undefined) {
+        var isChecked = this.toggleWidget.is(':checked');
+        for (var i = 0; i < this.rows.length; i++) {
+            if (isChecked) {
+                this.rows[i].show();
+            } else {
+                this.rows[i].not('.help-area').hide();
+            }
+        }
+    }
+    for (var ii = 0; ii < this.rowGroups.length; ii++) {
+        var rowSet = this.rowGroups[ii];
+        rowSet.updateVisibility();        
+    }
+};
+
+/*
+ * Find the row-set toggle widget i.e. the input element that indicates that
+ * the row-set rows should be made visible or not.
+ */
+ConfigRowGrouping.prototype.findToggleWidget = function(row) {
+    var $ = jQD.getJQuery();
+    var input = $(':input.block-control', row);
+    if (input.size() === 1) {
+        this.toggleWidget = input;
+        this.label = input.parent().find('label').text();
+        input.addClass('disable-behavior');
+    }
+};
diff --git a/war/src/main/js/widgets/config/model/ConfigSection.js b/war/src/main/js/widgets/config/model/ConfigSection.js
new file mode 100644
index 0000000000..8f8c7e88a7
--- /dev/null
+++ b/war/src/main/js/widgets/config/model/ConfigSection.js
@@ -0,0 +1,288 @@
+var jQD = require('../../../util/jquery-ext.js');
+var util = require('./util.js');
+var page = require('../../../util/page.js');
+var ConfigRowGrouping = require('./ConfigRowGrouping.js');
+var pageHeaderHeight = page.pageHeaderHeight();
+
+module.exports = ConfigSection;
+
+/*
+ * =======================================================================================
+ * Configuration table section.
+ * =======================================================================================
+ */
+function ConfigSection(headerRow, parentCMD) {
+    this.headerRow = headerRow;
+    this.parentCMD = parentCMD;
+    this.title = headerRow.attr('title');
+    this.id = util.toId(this.title);
+    this.rowGroups = undefined;
+    this.activator = undefined;
+    this.subSections = [];
+
+    this.headerRow.addClass(this.id);
+}
+
+ConfigSection.prototype.isTopLevelSection = function() {
+    return (this.parentCMD.getSection(this.id) !== undefined);
+};
+
+ConfigSection.prototype.isVisible = function() {
+    return this.headerRow.is(':visible');
+};
+
+/**
+ * Get the page offset (height) at which this section comes
+ * into view.
+ * @returns {number}
+ */
+ConfigSection.prototype.getViewportEntryOffset = function() {
+    return this.headerRow.offset().top - pageHeaderHeight;
+};
+
+/**
+ * Get the sibling section at the relative offset.
+ * @param relOffset
+ */
+ConfigSection.prototype.getSibling = function(relOffset) {
+    var sections = this.parentCMD.sections;
+    var endIndex = sections.length - 1;
+
+    for (var i = 0; i < endIndex; i++) {
+        var testIndex = i + relOffset;
+        if (testIndex < 0) {
+            continue;
+        } else if (testIndex > endIndex) {
+            return undefined;
+        }
+        if (sections[i] === this) {
+            return sections[testIndex];
+        }
+    }
+
+    return undefined;
+};
+
+/**
+ * Move another top-level section into this section i.e. adopt it.
+ * <p>
+ * This allows us to take a top level section (by id) and push it down
+ * into another section e.g. pushing the "Advanced" section into the
+ * "General" section.
+ * @param sectionId The id of the top-level section to be adopted.
+ */
+ConfigSection.prototype.adoptSection = function(sectionId) {
+    if (!this.isTopLevelSection()) {
+        // Only top-level sections can adopt.
+        return;
+    }
+    
+    var child = this.parentCMD.getSection(sectionId);
+    if (child && this.parentCMD.removeSection(child.id)) {
+        this.subSections.push(child);
+    }
+};
+
+/*
+ * Get the section rows.
+ */
+ConfigSection.prototype.getRows = function() {
+    var curTr = this.headerRow.next();
+    var rows = [];
+    var numNewRows = 0;
+
+    rows.push(curTr);
+    while(curTr.size() === 1 && !curTr.hasClass('section-header-row')) {
+        rows.push(curTr);
+        if (!curTr.hasClass(this.id)) {
+            numNewRows++;
+            curTr.addClass(this.id);
+        }
+        curTr = curTr.next();
+    }
+    
+    if (numNewRows > 0) {
+        // We have new rows in the section ... reset cached info.
+        if (this.rowGroups !== undefined) {
+            this.gatherRowGroups(rows);
+        }
+    }
+    
+    return rows;
+};
+
+/*
+ * Set the element (jquery) that activates the section (on click).
+ */
+ConfigSection.prototype.setActivator = function(activator) {
+    this.activator = activator;
+
+    var section = this;
+    section.activator.click(function() {
+        section.parentCMD.showSection(section);
+    });
+};
+
+ConfigSection.prototype.activate = function() {
+    if (this.activator) {
+        this.activator.click();
+    } else {
+        console.warn('No activator attached to config section object.');
+    }
+};
+
+ConfigSection.prototype.markAsActive = function() {
+    this.parentCMD.hideSection();
+    this.activator.addClass('active');
+    this.markRowsAsActive();
+};
+
+ConfigSection.prototype.markRowsAsActive = function() {
+    var rows = this.getRows();
+    for (var i = 0; i < rows.length; i++) {
+        rows[i].addClass('active');
+    }
+    for (var ii = 0; ii < this.subSections.length; ii++) {
+        this.subSections[ii].markRowsAsActive();
+    }
+    this.updateRowGroupVisibility();
+};
+
+ConfigSection.prototype.hasText = function(text) {
+    var $ = jQD.getJQuery();
+    var selector = ":containsci('" + text + "')";
+    var sectionRows = this.getRows();
+
+    for (var i1 = 0; i1 < sectionRows.length; i1++) {
+        var row = sectionRows[i1];
+        var elementsWithText = $(selector, row);
+
+        if (elementsWithText.size() > 0) {
+            return true;
+        }
+    }
+
+    for (var i2 = 0; i2 < this.subSections.length; i2++) {
+        if (this.subSections[i2].hasText(text)) {
+            return true;
+        }
+    }
+
+    return false;
+};
+
+ConfigSection.prototype.activeRowCount = function() {
+    var activeRowCount = 0;
+    var rows = this.getRows();
+    for (var i = 0; i < rows.length; i++) {
+        if (rows[i].hasClass('active')) {
+            activeRowCount++;
+        }
+    }
+    return activeRowCount;
+};
+
+ConfigSection.prototype.updateRowGroupVisibility = function() {
+    if (this.rowGroups === undefined) {
+        // Lazily gather row grouping information.
+        this.gatherRowGroups();
+    }
+    for (var i = 0; i < this.rowGroups.length; i++) {
+        var rowGroup = this.rowGroups[i];
+        rowGroup.updateVisibility();
+    }
+    for (var ii = 0; ii < this.subSections.length; ii++) {
+        this.subSections[ii].updateRowGroupVisibility();
+    }
+};
+
+ConfigSection.prototype.gatherRowGroups = function(rows) {
+    this.rowGroups = [];
+
+    // Only tracking row-sets that are bounded by 'row-set-start' and 'row-set-end' (for now).
+    // Also, only capturing the rows after the 'block-control' input (checkbox, radio etc)
+    // and before the 'row-set-end'.
+    // TODO: Find out how these actually work. It seems like they can be nested into a hierarchy :(
+    // Also seems like you can have these "optional-block" thingies which are not wrapped
+    // in 'row-set-start' etc. Grrrrrr :(
+
+    if (rows === undefined) {
+        rows = this.getRows();
+    }
+    if (rows.length > 0) {
+        // Create a top level "fake" ConfigRowGrouping just to capture
+        // the top level groupings. We copy the rowGroups info out
+        // of this and use it in the top "this" ConfigSection instance. 
+        var rowGroupContainer = new ConfigRowGrouping(rows[0], undefined);
+
+        this.rowGroups = rowGroupContainer.rowGroups;
+
+        for (var i = 0; i < rows.length; i++) {
+            var row = rows[i];
+
+            if (row.hasClass('row-group-start')) {
+                var newRowGroup = new ConfigRowGrouping(row, rowGroupContainer);
+                if (rowGroupContainer) {
+                    rowGroupContainer.rowGroups.push(newRowGroup);
+                }
+                rowGroupContainer = newRowGroup;
+                newRowGroup.findToggleWidget(row);
+            } else if (rowGroupContainer) {
+                if (row.hasClass('row-group-end')) {
+                    rowGroupContainer.endRow = row;
+                    rowGroupContainer = rowGroupContainer.parentRowGroupContainer; // pop back off the "stack"
+                } else if (rowGroupContainer.toggleWidget === undefined) {
+                    rowGroupContainer.findToggleWidget(row);
+                } else {
+                    // we have the toggleWidget, which means that this row is
+                    // one of the rows after that row and is one of the rows that's
+                    // subject to being made visible/hidden when the input is
+                    // checked or unchecked.
+                    rowGroupContainer.rows.push(row);
+                }
+            }
+        }
+    }
+};
+
+ConfigSection.prototype.getRowGroupLabels = function() {
+    var labels = [];
+    for (var i = 0; i < this.rowGroups.length; i++) {
+        var rowGroup = this.rowGroups[i];
+        labels.push(rowGroup.getLabels());
+    }
+    return labels;
+};
+
+ConfigSection.prototype.highlightText = function(text) {
+    var $ = jQD.getJQuery();
+    var selector = ":containsci('" + text + "')";
+    var rows = this.getRows();
+    
+    for (var i1 = 0; i1 < rows.length; i1++) {
+        var row = rows[i1];
+
+        page.removeTextHighlighting(row);
+
+        if (text !== '') {
+            var regex = new RegExp('(' + text + ')',"gi");
+
+            /*jshint loopfunc: true */
+            $(selector, row).find(':not(:input)').each(function() {
+                var $this = $(this);
+                $this.contents().each(function () {
+                    // We specifically only mess with text nodes
+                    if (this.nodeType === 3) {
+                        var $textNode = $(this);
+                        var highlightedMarkup = $textNode.text().replace(regex, '<span class="highlight">$1</span>');
+                        $textNode.replaceWith('<span class="highlight-split">' + highlightedMarkup + '</span>');
+                    }
+                });
+            });
+        }
+    }
+
+    for (var i2 = 0; i2 < this.subSections.length; i2++) {
+        this.subSections[i2].highlightText(text);
+    }
+};
diff --git a/war/src/main/js/widgets/config/model/ConfigTableMetaData.js b/war/src/main/js/widgets/config/model/ConfigTableMetaData.js
new file mode 100644
index 0000000000..c77425b2f0
--- /dev/null
+++ b/war/src/main/js/widgets/config/model/ConfigTableMetaData.js
@@ -0,0 +1,386 @@
+/*
+ * Internal support module for config tables.
+ */
+
+var jQD = require('../../../util/jquery-ext.js');
+var ConfigSection = require('./ConfigSection.js');
+var page = require('../../../util/page.js');
+var util = require('./util.js');
+
+exports.markConfigTableParentForm = function(configTable) {
+    var form = configTable.closest('form');
+    form.addClass('jenkins-config');
+    return form;
+};
+
+exports.findConfigTables = function() {
+    var $ = jQD.getJQuery();
+    // The config tables are the immediate child <table> elements of <form> elements
+    // with a name of "config"?
+    return $('form[name="config"] > table');
+};
+
+exports.fromConfigTable = function(configTable) {
+    var $ = jQD.getJQuery();
+    var sectionHeaders = $('.section-header', configTable);
+    var configForm = exports.markConfigTableParentForm(configTable);
+
+    // Mark the ancestor <tr>s of the section headers and add a title
+    sectionHeaders.each(function () {
+        var sectionHeader = $(this);
+        var sectionRow = sectionHeader.closest('tr');
+        var sectionTitle = sectionRow.text();
+
+        // Remove leading hash from accumulated text in title (from <a> element).
+        if (sectionTitle.indexOf('#') === 0) {
+            sectionTitle = sectionTitle.substring(1);
+        }
+
+        sectionRow.addClass('section-header-row');
+        sectionRow.attr('title', sectionTitle);
+    });
+
+    var configTableMetadata = new ConfigTableMetaData(configForm, configTable);
+    var topRows = configTableMetadata.getTopRows();
+    var firstRow = configTableMetadata.getFirstRow();
+    var curSection;
+
+    // The first set of rows don't have a 'section-header-row', so we manufacture one,
+    // calling it a "General" section. We do this by marking the first row in the table.
+    // See the next block of code.
+    
+    if(!firstRow.hasClass('section-header-row')){
+      var generalRow = $('<tr class="section-header-row insert first" title="General"><td colspan="4"><div class="section-header"><a class="section-anchor">#</a>General</div></td></tr>');
+      firstRow.before(generalRow);
+      firstRow = configTableMetadata.getFirstRow();
+      var newArray = $.makeArray(topRows);
+      newArray.unshift(generalRow[0]);
+      topRows = $(newArray);
+    }
+
+    firstRow.addClass('section-header-row');
+    firstRow.attr('title', "General");
+
+    // Go through the top level <tr> elements (immediately inside the <tbody>)
+    // and group the related <tr>s based on the "section-header-row", using a "normalized"
+    // version of the section title as the section id.
+    topRows.each(function () {
+        var tr = $(this);
+        if (tr.hasClass('section-header-row')) {
+            // a new section
+            curSection = new ConfigSection(tr, configTableMetadata);
+            configTableMetadata.sections.push(curSection);
+        }
+    });
+
+    var buttonsRow = $('#bottom-sticker', configTable).closest('tr');
+    buttonsRow.removeClass(curSection.id);
+    buttonsRow.addClass(util.toId('buttons'));
+
+    return configTableMetadata;
+};
+
+/*
+ * =======================================================================================
+ * ConfigTable MetaData class.
+ * =======================================================================================
+ */
+function ConfigTableMetaData(configForm, configTable) {
+    this.$ = jQD.getJQuery();
+    this.configForm = configForm;
+    this.configTable = configTable;
+    this.configTableBody = this.$('> tbody', configTable);
+    this.activatorContainer = undefined;
+    this.sections = [];
+    this.findInput = undefined;
+    this.showListeners = [];
+    this.configWidgets = undefined;
+    this.addWidgetsContainer();
+    this.addFindWidget();
+}
+
+ConfigTableMetaData.prototype.getTopRows = function() {
+    var topRows = this.configTableBody.children('tr');
+    topRows.addClass('config-table-top-row');
+    return topRows;
+};
+
+ConfigTableMetaData.prototype.getFirstRow = function() {
+    return this.getTopRows().first();
+};
+
+ConfigTableMetaData.prototype.addWidgetsContainer = function() {
+    var $ = jQD.getJQuery();
+    this.configWidgets = $('<div class="jenkins-config-widgets"></div>');
+    this.configWidgets.insertBefore(this.configForm);
+};
+
+ConfigTableMetaData.prototype.addFindWidget = function() {
+    var $ = jQD.getJQuery();
+    var thisTMD = this;
+    var findWidget = $('<div class="find-container"><div class="find"><span title="Clear" class="clear">x</span><input placeholder="find"/></div></div>');
+
+    thisTMD.findInput = $('input', findWidget);
+
+    // Add the find text clearer
+    $('.clear', findWidget).click(function() {
+        thisTMD.findInput.val('');
+        thisTMD.showSections('');
+        thisTMD.findInput.focus();
+    });
+
+    var findTimeout;
+    thisTMD.findInput.keydown(function() {
+        if (findTimeout) {
+            clearTimeout(findTimeout);
+            findTimeout = undefined;
+        }
+        findTimeout = setTimeout(function() {
+            findTimeout = undefined;
+            thisTMD.showSections(thisTMD.findInput.val());
+        }, 300);
+    });
+
+    $('.jenkins-config-widgets .find-container input').focus(function() {
+        page.fireBottomStickerAdjustEvent();
+    });
+
+    this.configWidgets.append(findWidget);
+};
+
+ConfigTableMetaData.prototype.sectionCount = function() {
+    return this.sections.length;
+};
+
+ConfigTableMetaData.prototype.hasSections = function() {
+    var hasSections = (this.sectionCount() > 0);
+    if (!hasSections) {
+        console.warn('Jenkins configuration without sections?');
+    }
+    return  hasSections;
+};
+
+ConfigTableMetaData.prototype.sectionIds = function() {
+    var sectionIds = [];
+    for (var i = 0; i < this.sections.length; i++) {
+        sectionIds.push(this.sections[i].id);
+    }
+    return sectionIds;
+};
+
+ConfigTableMetaData.prototype.activateSection = function(sectionId) {
+    if (!sectionId) {
+        throw 'Invalid section id "' + sectionId + '"';
+    }
+
+    var section = this.getSection(sectionId);
+    if (section) {
+        section.activate();
+    }
+};
+
+ConfigTableMetaData.prototype.activeSection = function() {
+    if (this.hasSections()) {
+        for (var i = 0; i < this.sections.length; i++) {
+            var section = this.sections[i];
+            if (section.activator.hasClass('active')) {
+                return section;
+            }
+        }
+    }
+};
+
+ConfigTableMetaData.prototype.getSection = function(ref) {
+    if (this.hasSections()) {
+        if (typeof ref === 'number') {
+            // It's a section index...
+            if (ref >= 0 && ref <= this.sections.length - 1) {
+                return this.sections[ref];
+            }
+        } else {
+            // It's a section ID...
+            for (var i = 0; i < this.sections.length; i++) {
+                var section = this.sections[i];
+                if (section.id === ref) {
+                    return section;
+                }
+            }
+        }
+    }
+    return undefined;
+};
+
+ConfigTableMetaData.prototype.removeSection = function(sectionId) {
+    if (this.hasSections()) {
+        for (var i = 0; i < this.sections.length; i++) {
+            var section = this.sections[i];
+            if (section.id === sectionId) {
+                this.sections.splice(i, 1);
+                if (section.activator) {
+                    section.activator.remove();
+                }
+                return true;
+            }
+        }
+    }
+    return false;
+};
+
+ConfigTableMetaData.prototype.activateFirstSection = function() {
+    if (this.hasSections()) {
+        this.activateSection(this.sections[0].id);
+    }
+};
+
+ConfigTableMetaData.prototype.activeSectionCount = function() {
+    var activeSectionCount = 0;
+    if (this.hasSections()) {
+        for (var i = 0; i < this.sections.length; i++) {
+            var section = this.sections[i];
+            if (section.activator.hasClass('active')) {
+                activeSectionCount++;
+            }
+        }
+    }
+    return activeSectionCount;
+};
+
+ConfigTableMetaData.prototype.showSection = function(section) {
+    if (typeof section === 'string') {
+        section = this.getSection(section);
+    }
+
+    if (section) {
+        var topRows = this.getTopRows();
+
+        // Active the specified section
+        section.markAsActive();
+
+        // and always show the buttons
+        topRows.filter('.config_buttons').show();
+
+        // Update text highlighting
+        section.highlightText(this.findInput.val());
+
+        fireListeners(this.showListeners, section);
+    }
+};
+
+ConfigTableMetaData.prototype.hideSection = function() {
+    var topRows = this.getTopRows();
+    var $ = jQD.getJQuery();
+
+    $('.config-section-activator.active', this.activatorContainer).removeClass('active');
+    topRows.filter('.active').removeClass('active');
+};
+
+ConfigTableMetaData.prototype.onShowSection = function(listener) {
+    this.showListeners.push(listener);
+};
+
+ConfigTableMetaData.prototype.showSections = function(withText) {
+    this.removeTextHighlighting();
+
+    if (withText === '') {
+        if (this.hasSections()) {
+            for (var i1 = 0; i1 < this.sections.length; i1++) {
+                this.sections[i1].activator.removeClass('hidden');
+            }
+            var activeSection = this.activeSection();
+            if (!activeSection) {
+                this.showSection(this.sections[0]);
+            } else {
+                activeSection.highlightText(this.findInput.val());
+            }
+        }
+    } else {
+        if (this.hasSections()) {
+            var sectionsWithText = [];
+
+            for (var i2 = 0; i2 < this.sections.length; i2++) {
+                var section = this.sections[i2];
+
+                if (section.hasText(withText)) {
+                    section.activator.removeClass('hidden');
+                    sectionsWithText.push(section);
+                } else {
+                    section.activator.addClass('hidden');
+                }
+            }
+
+            // Select the first section to contain the text.
+            if (sectionsWithText.length > 0) {
+                this.showSection(sectionsWithText[0]);
+            } else {
+                this.hideSection();
+            }
+        }
+    }
+};
+
+/**
+ * We need this because sections can mysteriously change visibility,
+ * which looks strange for scroolspy.
+ */
+ConfigTableMetaData.prototype.trackSectionVisibility = function() {
+    if (isTestEnv()) {
+        return;
+    }
+
+    var thisConfig = this;
+    
+    try {
+        for (var i = 0; i < this.sections.length; i++) {
+            var section = this.sections[i];
+            if (section.isVisible()) {
+                section.activator.show();
+            } else {
+                section.activator.hide();
+            }
+        }
+    } finally {
+        var interval = (thisConfig.trackSectionVisibilityTO || 0);
+        
+        // The rescan interval will drop off over time, starting out very fast.
+        interval += 10;
+        interval =  Math.min(interval, 500);
+        thisConfig.trackSectionVisibilityTO = interval;
+
+        setTimeout(function() {
+            thisConfig.trackSectionVisibility();
+        }, interval);
+    }
+};
+
+ConfigTableMetaData.prototype.removeTextHighlighting = function() {
+    page.removeTextHighlighting(this.configForm);
+};
+
+function fireListeners(listeners, contextObject) {
+    for (var i = 0; i < listeners.length; i++) {
+        fireListener(listeners[i], contextObject);
+    }
+    function fireListener(listener, contextObject) {
+        setTimeout(function() {
+            listener.call(contextObject);
+        }, 1);
+    }
+}
+
+function isTestEnv() {
+    if (window === undefined) {
+        return true;
+    } else if (window.navigator === undefined) {
+        return true;
+    } else if (window.navigator.userAgent === undefined) {
+        return true;
+    } else if (window.navigator.userAgent === 'JasmineTest') {
+        return true;
+    } else if (window.navigator.userAgent === 'JenkinsTest') {
+        return true;
+    } else if (window.navigator.userAgent.toLowerCase().indexOf("node.js") !== -1) {
+        return true;
+    }
+    
+    return false;
+}
\ No newline at end of file
diff --git a/war/src/main/js/widgets/config/model/util.js b/war/src/main/js/widgets/config/model/util.js
new file mode 100644
index 0000000000..1ef40e4b83
--- /dev/null
+++ b/war/src/main/js/widgets/config/model/util.js
@@ -0,0 +1,5 @@
+
+exports.toId = function(string) {
+    string = string.trim();
+    return 'config_' + string.replace(/[\W_]+/g, '_').toLowerCase();
+};
\ No newline at end of file
diff --git a/war/src/main/js/widgets/config/tabbar.js b/war/src/main/js/widgets/config/tabbar.js
new file mode 100644
index 0000000000..ddb87cc49b
--- /dev/null
+++ b/war/src/main/js/widgets/config/tabbar.js
@@ -0,0 +1,154 @@
+var jQD = require('jquery-detached');
+var page = require('../../util/page.js');
+var jenkinsLocalStorage = require('../../util/jenkinsLocalStorage.js');
+var tableMetadata = require('./model/ConfigTableMetaData.js');
+var behaviorShim = require('../../util/behavior-shim');
+
+exports.tabBarShowPreferenceKey = 'config:usetabs';
+
+exports.addPageTabs = function(configSelector, onEachConfigTable, options) {
+    var $ = jQD.getJQuery();
+
+    $(function() {
+        behaviorShim.specify(".dd-handle", 'config-drag-start', 1000, function(el) {
+            page.fixDragEvent(el);
+        });
+
+        // We need to wait until after radioBlock.js Behaviour.js rules
+        // have been applied, otherwise row-set rows become visible across sections.
+        page.onload('.block-control', function() {
+            // Only do job configs for now.
+            var configTables = $(configSelector);
+            if (configTables.size() > 0) {
+                var tabBarShowPreference = jenkinsLocalStorage.getGlobalItem(exports.tabBarShowPreferenceKey, "yes");
+
+                page.fixDragEvent(configTables);
+
+                if (tabBarShowPreference === "yes") {
+                    configTables.each(function() {
+                        var configTable = $(this);
+                        var tabBar = exports.addTabs(configTable, options);
+
+                        onEachConfigTable.call(configTable, tabBar);
+
+                        tabBar.deactivator.click(function() {
+                            jenkinsLocalStorage.setGlobalItem(exports.tabBarShowPreferenceKey, "no");
+                            require('window-handle').getWindow().location.reload();
+                        });
+                    });
+                } else {
+                    configTables.each(function() {
+                        var configTable = $(this);
+                        var activator = exports.addTabsActivator(configTable);
+                        tableMetadata.markConfigTableParentForm(configTable);
+                        activator.click(function() {
+                            jenkinsLocalStorage.setGlobalItem(exports.tabBarShowPreferenceKey, "yes");
+                            require('window-handle').getWindow().location.reload();
+                        });
+                    });
+                }
+            }
+        }, configSelector);
+    });
+};
+
+exports.addTabsOnFirst = function() {
+    return exports.addTabs(tableMetadata.findConfigTables().first());
+};
+
+exports.addTabs = function(configTable, options) {
+    var $ = jQD.getJQuery();
+    var configTableMetadata;
+    var tabOptions = (options || {});
+    var trackSectionVisibility = (tabOptions.trackSectionVisibility || false);
+
+    if ($.isArray(configTable)) {
+        // It's a config <table> metadata block
+        configTableMetadata = configTable;
+    } else if (typeof configTable === 'string') {
+        // It's a config <table> selector
+        var configTableEl = $(configTable);
+        if (configTableEl.size() === 0) {
+            throw "No config table found using selector '" + configTable + "'";
+        } else {
+            configTableMetadata = tableMetadata.fromConfigTable(configTableEl);
+        }
+    } else {
+        // It's a config <table> element
+        configTableMetadata = tableMetadata.fromConfigTable(configTable);
+    }
+
+    var tabBar = $('<div class="tabBar config-section-activators"></div>');
+    configTableMetadata.activatorContainer = tabBar;
+
+    function newTab(section) {
+        var tab = $('<div class="tab config-section-activator"></div>');
+
+        tab.text(section.title);
+        tab.addClass(section.id);
+
+        return tab;
+    }
+
+    var section;
+    for (var i = 0; i < configTableMetadata.sections.length; i++) {
+        section = configTableMetadata.sections[i];
+        var tab = newTab(section);
+        tabBar.append(tab);
+        section.setActivator(tab);
+    }
+
+    var tabs = $('<div class="form-config tabBarFrame"></div>');
+    var noTabs = $('<div class="noTabs" title="Remove configuration tabs and revert to the &quot;classic&quot; configuration view">Remove tabs</div>');
+
+    configTableMetadata.configWidgets.append(tabs);
+    configTableMetadata.configWidgets.prepend(noTabs);
+    tabs.append(tabBar);
+
+    tabs.mouseenter(function() {
+        tabs.addClass('mouse-over');
+    });
+    tabs.mouseleave(function() {
+        tabs.removeClass('mouse-over');
+    });
+    configTableMetadata.deactivator = noTabs;
+
+    // Always activate the first section by default. 
+    configTableMetadata.activateFirstSection();
+    
+    if (trackSectionVisibility === true) {
+        configTableMetadata.trackSectionVisibility();
+    }
+
+    return configTableMetadata;
+};
+
+exports.addTabsActivator = function(configTable) {
+    var $ = jQD.getJQuery();
+    var configWidgets = $('<div class="jenkins-config-widgets"><div class="showTabs" title="Add configuration section tabs">Add tabs</div></div>');
+    configWidgets.insertBefore(configTable.parent());
+    return configWidgets;
+};
+
+
+exports.addFinderToggle = function(configTableMetadata) {
+    var $ = jQD.getJQuery();
+    var findToggle = $('<div class="find-toggle" title="Find"></div>');
+    var finderShowPreferenceKey = 'config:showfinder';
+
+    findToggle.click(function() {
+        var findContainer = $('.find-container', configTableMetadata.configWidgets);
+        if (findContainer.hasClass('visible')) {
+            findContainer.removeClass('visible');
+            jenkinsLocalStorage.setGlobalItem(finderShowPreferenceKey, "no");
+        } else {
+            findContainer.addClass('visible');
+            $('input', findContainer).focus();
+            jenkinsLocalStorage.setGlobalItem(finderShowPreferenceKey, "yes");
+        }
+    });
+
+    if (jenkinsLocalStorage.getGlobalItem(finderShowPreferenceKey, "yes") === 'yes') {
+        findToggle.click();
+    }
+};
\ No newline at end of file
diff --git a/war/src/main/js/widgets/config/tabbar.less b/war/src/main/js/widgets/config/tabbar.less
new file mode 100644
index 0000000000..50817647bc
--- /dev/null
+++ b/war/src/main/js/widgets/config/tabbar.less
@@ -0,0 +1,359 @@
+/*
+ * Tab bar specific rules.
+ */
+
+.jenkins-config-widgets {
+  position: relative;
+  border:1px solid @solid-border;
+  border-bottom:none;
+  background:@light-backgrond;
+  min-height:2.5em;
+  .border-radius-top(@radius);
+  z-index:5;
+
+  nav:before, nav:after {
+    display: none;
+  }
+  
+  :hover .noTabs{
+    color:#bbb;
+  }
+  .noTabs:hover,
+  .showTabs:hover {
+    opacity: 0.8;
+    background:#bbb;
+    color:@light-backgrond;
+    text-shadow:none    
+  }
+
+  @find-container-width: 200px;
+  .find-container {
+    margin:0;
+    display:none;
+  }
+  
+  .showTabs,
+  .noTabs {
+    position: absolute;
+    border-radius: @radius;
+    right: 5px;
+    top: 5px;
+    cursor: pointer;
+    color: @solid-border;
+    text-shadow: @brightest 0 1px 2px;
+    font-size: 0.85em;
+    padding: 3px 7px;
+    display:none;
+  }
+
+  .form-config.tabBarFrame {
+    position: relative;
+    border-bottom: solid 1px @solid-border;
+
+    .config-section-activators {
+      margin: 0;
+      padding: 5px 0 0;
+      display: block;
+      list-style: none;
+    }
+
+    .tabBar {
+      .tab {
+        border: solid 1px transparent;
+        color: #999;
+        padding: 7px 10px;
+        .border-radius-top(5px);
+        cursor: pointer;
+        margin: 1px 0 0 10px;
+        text-decoration: none;
+      }
+      .tab:hover {
+        background:#bbb; color:@brightest;
+      }
+      .tab.active {
+        background: @bright;
+        color: #000;
+        font-weight: bold;
+        z-index: 2;
+        border:1px solid @solid-border;
+        border-bottom:1px solid @bright
+      }
+    }
+
+  }
+
+  .form-config.tabBarFrame.mouse-over {
+    .noTabs {
+      display: inline;
+    }
+    .noTabs:hover {
+      opacity: 0.8;
+    }
+  }
+
+}
+#jenkins{
+  .jenkins-config {
+    border:1px solid @solid-border;
+    padding:10px;
+    border-top:none;
+    background:@bright;
+    .border-radius-bottom(@radius);
+
+    .showTabs{
+      display:block;
+      text-align:right;
+
+    }
+
+    table.config-table {
+      .section-header-row {
+        background: none;
+        border-color: transparent
+      }
+      .section-header {
+        margin-top: 10px;
+      }
+    }
+
+    table {
+      border-collapse:collapse;
+
+      .bottom-sticker-edge {
+        display:none;
+      }
+      .bottom-sticker-inner{
+        padding: 20px 10px 25px 20px;
+        border-top-right-radius: 10px;
+        border: 1px solid @line-green;
+        background: @pale-green-trans;
+      }
+
+      .bottom-sticker,
+      #bottom-sticker{ 
+        width: auto;
+        margin-left: -10px;
+        overflow: hidden;
+        padding-bottom: 10px;
+        margin: 30px 30px -25px -15px;
+        z-index:9;
+        
+        .cover{
+          position:absolute;
+          top:0;
+          bottom:0;
+          left:0;
+          right:0;
+          z-index:2;
+        }
+        .yui-button.primary{
+          button{
+            background:@middle-blue;
+            border-color:@dark-blue;
+          }
+        }
+        .yui-button.yui-button-disabled{
+          button{
+            background:@light-backgrond;
+            border-color:@solid-border;
+            color:@solid-border;
+          }
+        }
+
+        .yui-button{
+          margin-right:10px;
+          
+          button{
+            padding:5px 20px;
+            background:@pale-blue;
+            border-color:@line-blue;
+          }
+        }
+      }
+
+      .section-header{
+        margin: 30px 0px 5px -10px;
+        font-size: 1.5em;
+        padding: 10px 15px;
+        border: none;
+        border-top: 1px solid #ddd;
+      }
+      .attach-previous {
+        margin-left:3px;
+      }
+      .validation-error-area td{
+        padding:0 5px;
+      }
+
+      .stapler-class-bag td {
+        padding: 0px;
+      }
+      
+      td.setting-name{
+        line-height:29px;
+      }
+      td.setting-main{
+        input[type='radio'],
+        input[type='checkbox']{
+          position:relative;
+          top:.33em;
+        }
+      }
+      td{
+        padding:5px;
+        
+        textarea.setting-input {
+          display:block;
+        }
+        
+        .yui-button button,
+        input[type='email'].setting-input,
+        input[type='password'].setting-input,
+        input[type='text'].setting-input{
+          height:@input-line-height;
+          line-height:@input-line-height;
+          padding:0 5px;
+          .border-radius(@radius);
+        }
+        .yui-button button{
+          padding:0 10px;
+          box-sizing:content-box;
+        }
+        
+        .yui-button button.hetero-list-add{
+          padding-right:25px;
+        }
+        
+        select:not([multiple]){
+          height:@input-line-height;
+          line-height:@input-line-height;
+        }
+        select{
+          border-radius:0;
+          background:@brightest;
+        }
+        .help{
+          background:@medium-translucent;
+        }
+        p,
+        .help,
+        .setting-description {
+          font-size:1em;
+          line-height:1.4;
+        } 
+      }
+      td[colspan="4"]:empty{
+        display:none
+      }
+      td.setting-help{
+        vertical-align:top;
+        padding:5px 10px 5px 5px
+      }
+      td.setting-leftspace:after {
+        content:' '; 
+        display:block; 
+        width:13px; 
+        height:1px;
+      }
+      .repeated-chunk,
+      tr[nameref^="rowSetStart"],
+      tr[nameref^="cb"],
+      tr[nameref^="radio-block"] {
+        background:@shade-hint; 
+        border-left:5px solid @shade
+      }
+      .hetero-list-container,
+      .repeated-container,
+      tr.optional-block-start,
+      tr.radio-block-start {
+        border-left:5px solid @shade; 
+        background:none;
+      }
+      tr.help-area {
+        background:none !important;
+        
+        td {
+          padding:0 5px
+        }
+      }
+      .CodeMirror {
+        background:@brightest;
+  
+      }
+      .CodeMirror-scroll {
+          border:1px solid @solid-border !important;
+      }
+      .repeated-container > .repeated-chunk {padding-top:15px;}
+      .repeated-chunk.hover{ 
+        border-color:@line-blue; 
+        box-shadow:0 2px 10px @shade, inset 0 200px 200px -200px @brightest; 
+        position:relative; 
+        z-index:2
+      }
+      .repeated-chunk.dragging{
+        position:static;
+      }
+      .repeated-chunk{
+        border:1px solid @shade;
+        margin:2px;
+        position:relative;
+      }  
+      .repeatable-delete {
+        position:absolute;
+        top:-2px;
+        right:35px;
+        height:18px;
+        width:32px;
+        .border-radius-bottom(3px);
+        overflow:hidden;
+        
+        button{
+          padding:0;
+          margin:0;
+          text-indent:999em;
+          background-color: @danger;
+          color: @light-backgrond;
+          border: 1px solid @danger-line;
+        }
+        button:focus,
+        button:hover{
+          background-color: @danger-dark;
+          border-color:@danger-dark-line;
+          color:@brightest;
+        }
+        button:before{
+          content: 'X';
+          font-weight: bold;
+          text-indent: 0;
+          display: block;
+          position: absolute;
+          left: 0;
+          right: 0;
+          top: 0;
+          bottom: 0;
+          text-align: center;
+          font-size: 12px;
+          line-height: 18px;
+        }  
+
+      }
+    }
+
+    span.highlight {
+      background-color: #ffff00;
+    }
+  }
+}
+#ygddfdiv {
+  background:@light-backgrond;
+  border:1px solid @line-blue !important;
+  opacity:.5;
+}
+
+.yui-skin-sam .yuimenu {
+  z-index: 9999 !important
+}
+
+.yui-skin-sam .yui-button-disabled {
+  opacity: .75
+}
diff --git a/war/src/main/js/widgets/form/form-mixins.less b/war/src/main/js/widgets/form/form-mixins.less
new file mode 100644
index 0000000000..6182ea3d92
--- /dev/null
+++ b/war/src/main/js/widgets/form/form-mixins.less
@@ -0,0 +1,51 @@
+/*
+ * Mixins for form elements
+ */
+
+.find-container(@width: 200px) {
+  padding: 5px;
+
+  .find:after {
+    content: ' ';
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    width: 25px;
+    background: url(../images/16x16/search.png) no-repeat 4px;
+    -webkit-filter: grayscale(85%);
+    filter: grayscale(85%);
+    filter: gray;
+    opacity: .5;
+  }
+
+  .find {
+    position: relative;
+    width: @width;
+    vertical-align: middle;
+
+    input {
+      width: 100%;
+      height:@input-line-height;
+      line-height:@input-line-height;
+      padding:0 5px 0 25px;
+      border: 1px solid #DDD;
+      .border-radius(@radius);
+    }
+    .clear {
+      position: absolute;
+      height:@input-line-height;
+      line-height:@input-line-height;
+      cursor: pointer;
+      right: 0;
+      opacity: 0.5;
+      font-weight: bold;
+      display:block;
+      padding:0 7px;
+    }
+    .clear:hover {
+      opacity: 1.0;
+    }
+  }
+}
\ No newline at end of file
diff --git a/war/src/main/js/widgets/layout-mixins.less b/war/src/main/js/widgets/layout-mixins.less
new file mode 100644
index 0000000000..d2186a91e8
--- /dev/null
+++ b/war/src/main/js/widgets/layout-mixins.less
@@ -0,0 +1,69 @@
+/*
+ * General/layout mixins
+ */
+
+.no-select{
+  -webkit-touch-callout: none; /* iOS Safari */
+  -webkit-user-select: none;   /* Chrome/Safari/Opera */
+  -khtml-user-select: none;    /* Konqueror */
+  -moz-user-select: none;      /* Firefox */
+  -ms-user-select: none;       /* IE/Edge */
+  user-select: none;
+}
+.text-select{
+  -webkit-touch-callout: text; /* iOS Safari */
+  -webkit-user-select: text;   /* Chrome/Safari/Opera */
+  -khtml-user-select: text;    /* Konqueror */
+  -moz-user-select: text;      /* Firefox */
+  -ms-user-select: text;       /* IE/Edge */
+  user-select: text;
+}
+
+/*
+ * Border radius
+ */
+.border-radius(@radius) {
+  -webkit-border-radius: @radius;
+  -moz-border-radius: @radius;
+  border-radius: @radius;
+}
+.border-radius-top-left(@radius) {
+  -webkit-border-top-left-radius: @radius;
+  -moz-border-top-left-radius: @radius;
+  border-top-left-radius: @radius;
+}
+.border-radius-top-right(@radius) {
+  -webkit-border-top-right-radius: @radius;
+  -moz-border-top-right-radius: @radius;
+  border-top-right-radius: @radius;
+}
+.border-radius-bottom-left(@radius) {
+  -webkit-border-bottom-left-radius: @radius;
+  -moz-border-bottom-left-radius: @radius;
+  border-top-bottom-radius: @radius;
+}
+.border-radius-bottom-right(@radius) {
+  -webkit-border-bottom-right-radius: @radius;
+  -moz-border-bottom-right-radius: @radius;
+  border-top-bottom-radius: @radius;
+}
+.border-radius-top(@radius) {
+  .border-radius-top-left(@radius);
+  .border-radius-top-right(@radius);
+}
+.border-radius-bottom(@radius) {
+  .border-radius-bottom-left(@radius);
+  .border-radius-bottom-right(@radius);
+}
+.border-radius-left(@radius) {
+  .border-radius-top-left(@radius);
+  .border-radius-bottom-left(@radius);
+}
+.border-radius-right(@radius) {
+  .border-radius-top-right(@radius);
+  .border-radius-bottom-right(@radius);
+}
+
+.hidden {
+  display: none;
+}
\ No newline at end of file
diff --git a/war/src/main/js/widgets/variables.less b/war/src/main/js/widgets/variables.less
new file mode 100644
index 0000000000..7b70d9bdef
--- /dev/null
+++ b/war/src/main/js/widgets/variables.less
@@ -0,0 +1,29 @@
+@brightest:#fff;
+@bright:#f9f9f9;
+@medium-translucent: rgba(255,255,255,.75);
+
+@pale-green-trans:rgba(245, 249, 239,.75);
+@pale-blue-trans:rgba(120, 180, 220, 0.5);
+@pale-blue:#cde;
+@middle-blue:#478;
+@dark-blue:#356;
+
+
+@shade-hint: rgba(0,0,0,.025);
+@shade: rgba(0,0,0,.1);
+@shadow: rgba(0,0,0,.25);
+
+@light-border: #f3f3f3;
+@light-backgrond: #eee;
+@solid-border: #ccc;
+@radius:3px;
+
+@line-blue: #69c;
+@line-green: #acb;
+
+@danger: #d24939;
+@danger-line:#be3a2b;
+@danger-dark:#a23225;
+@danger-dark-line:#942e22;
+
+@input-line-height:2.25em;
\ No newline at end of file
diff --git a/war/src/main/less/pluginSetupWizard.less b/war/src/main/less/pluginSetupWizard.less
new file mode 100644
index 0000000000..0e9e2c2668
--- /dev/null
+++ b/war/src/main/less/pluginSetupWizard.less
@@ -0,0 +1,841 @@
+@import (css) 'https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css';
+@import (css) '../css/icons/icomoon.css';
+@import url(https://fonts.googleapis.com/css?family=Roboto:400,300,500,900,700);
+
+
+.plugin-setup-wizard() {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1000;
+    background: rgba(0,0,0,.2);
+    text-align: initial;
+    font-family: sans-serif;
+
+
+    table, form, input, td, th, p, textarea, select,h1,h2,h3,h4,h5{
+      font-family:'roboto',sans-serif;
+    }
+
+
+    input,password { // get rid of the ms X (it doesn't fire a change event!), we provide our own
+        &::-ms-clear { width : 0; height: 0; }
+        &::-ms-reveal { width : 0; height: 0; }
+    }
+
+    a, button {
+        &:focus, &:active { outline: 0; }
+    }
+
+    .spin(@duration: 2s) {
+        -webkit-animation-name: spin;
+        -webkit-animation-duration: @duration;
+        -webkit-animation-iteration-count: infinite;
+        -webkit-animation-timing-function: linear;
+        -moz-animation-name: spin;
+        -moz-animation-duration: @duration;
+        -moz-animation-iteration-count: infinite;
+        -moz-animation-timing-function: linear;
+        -ms-animation-name: spin;
+        -ms-animation-duration: @duration;
+        -ms-animation-iteration-count: infinite;
+        -ms-animation-timing-function: linear;
+        animation-name: spin;
+        animation-duration: @duration;
+        animation-iteration-count: infinite;
+        animation-timing-function: linear;
+    }
+
+    .no-spin() {
+        -webkit-animation-name: none;
+        -moz-animation-name: none;
+        -ms-animation-name: none;
+        animation-name: none;
+    }
+    
+    .modal {
+        padding: 20px 0;
+    }
+
+    .modal-dialog {
+        width: 90%;
+        height: 100%;
+        padding: 0;
+        position: relative;
+        margin: 0 auto;
+        max-width:992px;
+        font-family:'roboto',sans-serif;
+    }
+
+    .modal-content {
+        height: 100%;
+        position: relative;
+        box-sizing: border-box;
+        padding: 4.2em 0 4.8em 0;
+    }
+
+    .container.error-container {
+        padding: 4em 3em;
+        max-width: 100%;
+        
+        h1 {
+        color: #a94442;
+    }
+    }
+
+    .modal-body {
+        background: linear-gradient(175deg, #f8f8f8 0%, rgba(255, 255, 255, 1) 22%, rgba(255, 255, 255, 0) 100%);
+        overflow-y: auto;
+        height: 100%;
+        padding:0;
+        border-bottom:1px solid #ccc;
+
+        .water-mark{
+          font-size: 392px;
+          position: absolute;
+          display: block;
+          bottom: 0px;
+          right: 50px;
+          color: rgba(0,0,0,.05);
+        }
+
+        .installing-panel{
+          border-bottom:1px solid #ccc;
+          margin:0;
+          padding:7.5% 10%;
+          height:33.3%;
+          position:relative;
+          z-index:9;
+          box-shadow:rgba(0,0,0,.5) 0 1px 5px;
+
+          @media screen and (max-width: 992px) {
+            padding:5%;
+        h1{
+          font-size:24px;
+        }
+          }
+
+          @media screen and (max-width: 768px) {
+            padding:5%;
+            height:auto;
+            h1{
+              display:none;
+            }
+          }
+
+          .progress{
+            margin:0;
+          }
+
+          .selected-plugin-progress{
+            width:75%;
+          }
+        }
+
+    }
+
+    .modal-header {
+        position: absolute;
+        top: 0;
+        right: 0;
+        left: 0;
+        height: 4.2em;
+        z-index: 2;
+        background: #fff;
+        border-radius: 5px 5px 0 0;
+
+        .close {
+            line-height: 1.42857143;
+            margin-right: 5px;
+        }
+    }
+
+    .modal-footer {
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        height: 4.8em;
+        padding: 1em;
+        z-index: 2;
+        background: #fff;
+        border-radius: 0 0 5px 5px;
+    }
+
+    .plugin-selector {
+        overflow-y: hidden;
+
+        @media screen and (min-width: 768px) {
+            height: 100%;
+        }
+
+        .plugins {
+            padding-top: 2.75em;
+            position: relative;
+            border-left:1px solid rgba(0,0,0,.2);
+
+            @media screen and (min-width: 768px) {
+                height: 100%;
+            }
+
+            h2 {padding-top:10px; margin-top:0}
+
+            .plugin-select-actions, .plugin-selected-info {
+                position: absolute;
+                top: 0;
+                left: 10px;
+                line-height: 34px;
+
+                &.plugin-selected-info {
+                    right: 10px;
+                    left: auto;
+                }
+
+                a + a:before {
+                    content: '|';
+                    font-size: 11px;
+                    text-decoration: none !important;
+                    display: inline-block;
+                    margin: 0 5px 0 2px;
+                }
+            }
+
+            .plugin-search-controls {
+                position: relative;
+                display: block;
+                margin: 0 -17px;
+
+                @media screen and (min-width: 768px) {
+                    width: 100%;
+                    max-width: 32em;
+                    margin: 0;
+
+                    input[name=searchbox] {
+                        display: inline-block;
+                    }
+                }
+
+                .clear-search {
+                    display: inline-block;
+                    position: absolute;
+                    top: 50%;
+                    right: 8px;
+                    margin-top: -12px;
+                    font-size: 23px;
+                    line-height: 30px;
+                    background: transparent;
+                    color: #ddd;
+                    text-decoration: none;
+                    font-weight: bold;
+
+                    &:hover, &:focus {
+                        color: #444;
+                    }
+                }
+            }
+
+            .plugin-select-controls {
+                @media screen and (min-width: 768px) {
+                    position: absolute;
+                    padding: 0 9em 0 14em;
+                }
+
+                top: 0;
+                right: 0;
+                left: 0;
+                padding: 0 10px;
+                height: 2.75em;
+                z-index: 100;
+                background:rgba(0,0,0,.03);
+                border-bottom:1px solid rgba(0,0,0,.2);
+
+
+                .form-control{
+                  font-size:13px;
+                  padding:2px 5px;
+                  height:30px;
+                  top:2px;
+                  position:relative;
+                }
+            }
+
+            .plugin-list-description {
+                margin: -10px -10px 0px -10px;
+                padding: 10px 20px;
+                opacity: 0.7;
+                border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+            }
+
+            .plugin-list {
+                position: relative;
+                padding: 10px;
+                margin: 0 -15px;
+                clear: both;
+                @media screen and (min-width: 768px) {
+                    max-height: 100%;
+                }
+                overflow-y: auto;
+
+                h2 {
+                  font-size:28px;
+                    transition: all .15s;
+                    &:first-child {
+                        margin-top: 0;
+                    }
+                }
+
+                &.searching-with-transition {
+					.plugin {
+                        display: none;
+                        transition: all .25s;
+
+
+                        &.match {
+                            display: block;
+                            background: #d9edf7;
+                            margin: 4px -7px;
+                            padding: 6px 0 6px 26px;
+                            border-radius: 2px;
+                            border: 1px solid #bce8f1;
+                            color: #31708f;
+
+                            &.selected {
+                                background: #dff0d8;
+                                border: 1px solid #c2e0a9;
+                                color: #3c763d;
+                            }
+                        }
+                    }
+                    h2 {
+                        color: #ddd;
+                        transition: all .5s;
+                        font-size: 22px;
+                        margin: 6px 0 6px -5px;
+                    }
+                }
+
+                &.searching {
+					.plugin {
+                        display: none;
+                        transition: all .25s;
+
+                        &.match {
+                            display: block;
+                        }
+                    }
+                    h2 {
+                        display: none;
+                        &.match {
+                            color: #ddd;
+                            transition: all .5s;
+                            font-size: 22px;
+                            margin: 6px 0 6px -5px;
+                            display: block;
+                        }
+                    }
+                }
+
+				.plugin {
+					position: relative;
+				
+					&.selected label {
+						background: #dff0d8;
+						margin: 4px -7px;
+						padding: 6px 0 6px 26px;
+						border-radius: 2px;
+						border: 1px solid #C2E0A9;
+						color: #3c763d;
+
+						.dependencies {
+							color: #777;
+						}
+					}
+	
+                label {
+                    font-weight: normal;
+                    padding: 7px 2px 7px 27px;
+                    position: relative;
+                    display: block;
+                    cursor: pointer;
+                    margin: 4px -7px;
+
+                    &:hover{
+                      background: rgba(100, 200, 255, 0.1);
+						  box-shadow:inset 0 400px 400px -100px rgba(100, 200, 255, 0.33), inset 0 0 0 1px rgba(100, 200, 255, 0.33);
+                    }
+
+                    .title {
+                        display: block;
+                        font-weight: bold;
+                        white-space: nowrap;
+                        position: relative;
+                    }
+
+                    .description {
+                        display: block;
+                        margin-top: .5em;
+                    }
+
+                    input[type=checkbox] {
+                        float: left;
+                        margin: 2px -18px;
+                        vertical-align: middle;
+                    }
+
+                    + .tooltip {
+                        left: 2px !important;
+                        margin-right: 16px;
+
+                        .tooltip-arrow {
+                        left: 4em !important;
+                        }
+
+                        .tooltip-inner {
+                        max-width: none;
+                        padding: .5em 1em;
+                        text-align: left;
+                        }
+                    }
+                }
+	
+					.toggle-dependency-list {
+						position: absolute;
+						top: 0;
+						right: 0;
+						color: #777;
+						border: 0;
+						text-decoration: none;
+						padding: 5px 13px;
+						z-index: 100;
+						
+						.badge {
+							margin-left: 7px;
+						}
+						
+						&:hover, &.active {
+							text-decoration: underline;
+						}
+					}
+					
+					.dep-list {
+						padding: 10px 0 6px 0;
+						display: none;
+						
+						.badge {
+							padding: 4px 8px;
+							margin: 5px 3px 0 0;
+						}
+					}
+						
+					&.show-dependencies {
+						.toggle-dependency-list:after {
+							content: '';
+							display: inline-block;
+							position: absolute;
+							top: 50%;
+							right: 100%;
+							width: 0; 
+							height: 0; 
+							border-left: 7px solid transparent;
+							border-right: 7px solid transparent;
+							border-top: 7px solid #999;
+							margin: -3px -3px 0 0;
+						}
+						
+						.dep-list {
+							display: block;
+						}
+					}
+				}
+            }
+        }
+
+        .categories {
+            position: relative;
+            display: none;
+            overflow-y: auto;
+
+            @media screen and (min-width: 768px) {
+                display: block;
+                max-height: 100%;
+            }
+
+            .nav{
+              margin:5px -5px;
+            }
+
+            li {
+                a {
+                    position: relative;
+                    padding: .5em;
+                    display: block;
+                    color: #444;
+                    text-decoration: none;
+                    background: transparent;
+                    border: none;
+                    font-weight:500;
+                    border-radius:none;
+
+                    &:after {
+                        content: '';
+                        display: none;
+                        position: absolute;
+                        top: 0;
+                        right: 0;
+                        bottom: 0;
+                        width: 2px;
+                        background: #337ab7;
+                    }
+
+                    &:hover {
+                      background:rgba(100,200,255,.1);
+                      box-shadow:inset -200px 0 200px -200px rgba(100,200,255,.33);
+                        color: #337ab7;
+
+                        &:after {
+                            display: block;
+                        }
+                    }
+                }
+
+                &.active a {
+                    color: #337ab7;
+
+                    &:after {
+                        display: block;
+                        width: 4px;
+                    }
+                }
+            }
+        }
+    }
+
+    .install-console {
+    border-left: 1px solid #ccc;
+    background: #f8f8f8;
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    display: block;
+    z-index: 5;
+    top: 33.3%;
+    width: 25%;
+    
+    .install-console-scroll {
+        position: absolute;
+        top: 6px;
+        right: 0;
+        bottom: 2em;
+        left: 0;
+        overflow:auto;
+        font: 12px monospace;
+    }
+    
+     @media screen and (max-width: 992px) {
+       width: 100%;
+       position:static;
+       max-height:33%;
+    }
+
+        .selected {
+            font: 12px monospace;
+            overflow: auto;
+            height: 100%;
+            display:block;
+            padding:1px 10px;
+
+          &:nth-child(odd){
+            background:rgba(0,0,0,.05);
+          }
+        }
+
+        .dependent {
+            color: #777;
+            padding-left: 10px;
+
+            &:before {
+                content: ' ** ';
+            }
+        }
+        
+        .dependency-legend {
+            color: #777;
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            border-top: 1px solid #ccc;
+            background: #f8f8f8;
+            padding: 4px 10px;
+            font: 12px monospace;
+        }
+    }
+
+    .selected-plugin-progress {
+    position: absolute;
+    bottom: 0;
+    overflow: hidden;
+    overflow-y: auto;
+    top: 33.3%;
+    margin: 0;
+    padding: 0;
+    width: 75%;
+    font-size: 0;
+    background:rgba(0,0,0,.1);
+    border-bottom:1px solid #ccc;
+    border-top:1px solid rgba(0,0,0,.1);
+
+        @media screen and (max-width: 992px) {
+           width: 100%;
+           position:static;
+           max-height:33%;
+        }
+        &.success-panel {
+            bottom: 0;
+            width:100%;
+        }
+
+        .selected-plugin {
+      display: inline-block;
+      vertical-align: top;
+      padding: 5px 5px 5px 30px;
+      position: relative;
+      width: 25%;
+      overflow:hidden;
+      font-size: 13px;
+      height: 45px;
+      border-right: 1px solid rgba(0,0,0,.1);
+      border-bottom: 1px solid rgba(0,0,0,.1);
+      box-shadow:0 1px 3px rgba(0,0,0,.2);
+      background:rgba(255,255,255,.75);
+
+            &:nth-child(odd){
+              box-shadow:0 1px 3px rgba(0,0,0,.2),inset 0 0 0 999px rgba(0,0,0,.05);
+            }
+            &:before { // pending
+                font-family: FontAwesome;
+                font-size: 17px;
+                content: '\f10c';
+                color: rgba(0,0,0,.1);
+                position: absolute;
+                left:5px;
+            }
+
+            &.installing {
+                &:before {
+                    content: '\f021';
+                    color: rgba(0,60,100,.33);
+                    .spin();
+                }
+            }
+            &.success {
+              background:#e5f9e5;
+                &:before {
+                    content: '\f00c';
+                    color: #3c763d;
+
+                    .no-spin();
+                }
+            }
+            &.fail {
+              background:#fdd;
+                &:before {
+                    content: '\f00d';
+                    color: #a94442;
+                    .no-spin();
+                }
+            }
+        }
+    }
+
+    .welcome-panel {
+        position: relative;
+        background: transparent;
+        padding: 0 10%;
+
+        h1{font-size:48px; margin-top:5px;}
+
+        @media screen and (min-width: 768px) {
+            padding-top: 5%;
+        }
+
+        .button-set {
+            margin-top: 40px;
+
+            .btn {
+                text-align: left;
+            }
+        }
+
+        .btn-huge {
+          font-weight:200;
+            display: inline-block;
+            text-align: initial;
+            width: 22em;
+            white-space: normal;
+            vertical-align: top;
+            min-height: 12.5em;
+            margin-right: 1.3%;
+            margin-top: 1em;
+            padding:20px 25px;
+            box-shadow:inset 0 -200px 200px -100px rgba(0,0,0,.1), 0 1px 3px rgba(0,0,0,.2);
+            border:1px solid rgba(0,60,100,.5);
+            text-shadow:#fff 0 1px 3px;
+            position:relative;
+            background:rgba(255,255,255,.75);
+
+            @media screen and (min-width: 768px) {
+                max-width: 41%;
+                min-width: 14em;
+                margin-top: 0;
+            }
+
+            &:hover{
+              box-shadow:inset 0 1px 3px -1px rgba(0,0,0,.2);
+        background:rgba(100,200,255,.1);
+            }
+            &:focus{
+              background:#fff;
+        box-shadow:inset 0 -200px 200px -100px rgba(0,0,0,.1),0 0 5px 3px rgba(00,180,250,.2);
+      }
+      &:hover:focus{
+        background:rgba(100,200,255,.1);
+      }
+            &.btn-primary{
+              background:rgba(200,240,255,.2);
+
+              box-shadow:inset 0 -200px 200px -100px rgba(0,120,160,.2), 0 1px 3px rgba(0,0,0,.2);
+              color:rgba(0,80,120,1);
+
+              &:hover{
+                box-shadow:inset 0 1px 3px -1px rgba(0,0,0,.2);
+          background:rgba(70,200,255,.2);
+              }
+              &:focus{
+          box-shadow:inset 0 -200px 200px -100px rgba(0,120,160,.2),0 0 5px 3px rgba(00,180,250,.2);        }
+            }
+            .icon {
+              position: absolute;
+        bottom: 20px;
+        right: 10px;
+        font-size: 144px;
+        opacity: .0;
+            }
+            b {
+                display: block;
+                font-size: 24px;
+                line-height:100%;
+                margin-bottom:5px;
+                min-height:81px;
+                font-weight:600;
+                width:80%;
+            }
+            sub{
+              font-size:21px;
+            }
+            span {
+                display: block;
+            }
+        }
+    }
+    
+    .security-panel {
+        &.security-panel, > iframe {
+            position: absolute;
+            top: 0;
+            left: 0;
+            bottom: 0;
+            right: 0;
+            border: 0;
+            width: 100%;
+            height: 100%;
+            padding: 0;
+            margin: 0;
+        }
+    }
+}
+
+@-ms-keyframes spin {
+    from { -ms-transform: rotate(0deg); }
+    to { -ms-transform: rotate(360deg); }
+}
+@-moz-keyframes spin {
+    from { -moz-transform: rotate(0deg); }
+    to { -moz-transform: rotate(360deg); }
+}
+@-webkit-keyframes spin {
+    from { -webkit-transform: rotate(0deg); }
+    to { -webkit-transform: rotate(360deg); }
+}
+@keyframes spin {
+    from { transform:rotate(0deg); }
+    to { transform:rotate(360deg); }
+}
+
+body .plugin-setup-wizard { // need specificity, revisit the CSS inclusion order
+    .plugin-setup-wizard();
+}
+
+@fb-loader-color: #E6E6E6;
+
+.loader,
+.loader:before,
+.loader:after {
+    background: @fb-loader-color;
+    -webkit-animation: fb-loader 1s infinite ease-in-out;
+    animation: fb-loader 1s infinite ease-in-out;
+    width: 7px;
+    height: 8px;
+}
+.loader:before,
+.loader:after {
+    position: absolute;
+    top: 0;
+    content: '';
+}
+.loader:before {
+    left: -10px;
+    -webkit-animation-delay: -0.32s;
+    animation-delay: -0.32s;
+}
+.loader {
+    text-indent: -9999em;
+    top: 50%;
+    margin: -4px auto 0 auto;
+    position: relative;
+    font-size: 6px;
+    -webkit-transform: translateZ(0);
+    -ms-transform: translateZ(0);
+    transform: translateZ(0);
+    -webkit-animation-delay: -0.16s;
+    animation-delay: -0.16s;
+}
+.loader:after {
+    left: 10px;
+}
+@-webkit-keyframes fb-loader {
+    0%,
+    80%,
+    100% {
+        box-shadow: 0 0 @fb-loader-color;
+        height: 4em;
+    }
+    40% {
+        box-shadow: 0 -2em @fb-loader-color;
+        height: 5em;
+    }
+}
+@keyframes fb-loader {
+    0%,
+    80%,
+    100% {
+        box-shadow: 0 0 @fb-loader-color;
+        height: 4em;
+    }
+    40% {
+        box-shadow: 0 -2em @fb-loader-color;
+        height: 5em;
+    }
+}
diff --git a/war/src/main/webapp/WEB-INF/web.xml b/war/src/main/webapp/WEB-INF/web.xml
index bb63b161a9..f9b401b608 100644
--- a/war/src/main/webapp/WEB-INF/web.xml
+++ b/war/src/main/webapp/WEB-INF/web.xml
@@ -23,10 +23,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1"
+         metadata-complete="true">
   <display-name>Jenkins v${project.version}</display-name>
   <description>Build management system</description>
 
@@ -43,6 +44,11 @@ THE SOFTWARE.
     </init-param>
   </servlet>
 
+  <context-param>
+      <param-name>install-wizard-path</param-name>
+      <param-value>jsbundles/pluginSetupWizard</param-value>
+  </context-param>
+
   <servlet-mapping>
     <servlet-name>Stapler</servlet-name>
     <url-pattern>/*</url-pattern>
@@ -169,7 +175,7 @@ THE SOFTWARE.
       <!--http-method>GET</http-method-->
     </web-resource-collection>
     <auth-constraint>
-      <role-name>*</role-name>
+      <role-name>**</role-name>
     </auth-constraint>
   </security-constraint>
   
@@ -231,4 +237,11 @@ THE SOFTWARE.
     <exception-type>java.lang.Throwable</exception-type>
     <location>/oops</location>
   </error-page>
+
+  <session-config>
+    <cookie-config>
+      <!-- See https://www.owasp.org/index.php/HttpOnly for the discussion of this topic in OWASP -->
+      <http-only>true</http-only>
+    </cookie-config>
+  </session-config>
 </web-app>
diff --git a/war/src/main/webapp/css/icons/icomoon.css b/war/src/main/webapp/css/icons/icomoon.css
new file mode 100644
index 0000000000..95e30c4955
--- /dev/null
+++ b/war/src/main/webapp/css/icons/icomoon.css
@@ -0,0 +1,418 @@
+@font-face {
+	font-family: 'icomoon';
+	src:url('icomoon/icomoon.eot?-itxuas');
+	src:url('icomoon/icomoon.eot?#iefix-itxuas') format('embedded-opentype'),
+		url('icomoon/icomoon.ttf?-itxuas') format('truetype'),
+		url('icomoon/icomoon.woff?-itxuas') format('woff'),
+		url('icomoon/icomoon.svg?-itxuas#icomoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+[class^="icon-"], [class*=" icon-"] {
+	font-family: 'icomoon';
+	speak: none;
+	font-style: normal;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+
+	/* Better Font Rendering =========== */
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-jira:before {
+	content: "\e677";
+}
+.icon-hipchat:before {
+	content: "\e67e";
+}
+.icon-AWS_Elastic_BeanStalk:before {
+	content: "\e67b";
+}
+.icon-mercurial:before {
+	content: "\e673";
+}
+.icon-bitbucket:before {
+	content: "\e67f";
+}
+.icon-git-logo:before {
+	content: "\e674";
+}
+.icon-github:before {
+	content: "\e675";
+}
+.icon-subversion:before {
+	content: "\e676";
+}
+.icon-pivotal:before {
+	content: "\e660";
+}
+.icon-vmware:before {
+	content: "\e65e";
+}
+.icon-ec2:before {
+	content: "\e65f";
+}
+.icon-siren:before {
+	content: "\e656";
+}
+.icon-cloudbees-logo:before {
+	content: "\e64a";
+}
+.icon-code:before {
+	content: "\e647";
+}
+.icon-docker:before {
+	content: "\e640";
+}
+.icon-fingerprint:before {
+	content: "\e63a";
+}
+.icon-groovy:before {
+	content: "\e638";
+}
+.icon-grails:before {
+	content: "\e637";
+}
+.icon-git:before {
+	content: "\e635";
+}
+.icon-sbt:before {
+	content: "\e636";
+}
+.icon-gradle:before {
+	content: "\e634";
+}
+.icon-ant:before {
+	content: "\e632";
+}
+.icon-service:before {
+	content: "\e62a";
+}
+.icon-service-o:before {
+	content: "\e62b";
+}
+.icon-menu:before {
+	content: "\e620";
+}
+.icon-build-hand:before {
+	content: "\e61b";
+}
+.icon-menu2:before {
+	content: "\e66b";
+}
+.icon-content-paste:before {
+	content: "\e666";
+}
+.icon-format-color-fill:before {
+	content: "\e658";
+}
+.icon-puzzle:before {
+	content: "\e64f";
+}
+.icon-flow-merge:before {
+	content: "\e671";
+}
+.icon-flow-switch:before {
+	content: "\e672";
+}
+.icon-thermometer:before {
+	content: "\e659";
+}
+.icon-arrow-shuffle:before {
+	content: "\e630";
+}
+.icon-arrow-right:before {
+	content: "\e631";
+}
+.icon-chat-3:before {
+	content: "\e680";
+}
+.icon-health:before {
+	content: "\e657";
+}
+.icon-screwdriver:before {
+	content: "\e668";
+}
+.icon-clipboard:before {
+	content: "\e667";
+}
+.icon-calendar:before {
+	content: "\e663";
+}
+.icon-maven:before {
+	content: "\e633";
+}
+.icon-brick-menu-o:before {
+	content: "\e62c";
+}
+.icon-brick-o:before {
+	content: "\e62d";
+}
+.icon-gear-menu-o:before {
+	content: "\e627";
+}
+.icon-gear-menu:before {
+	content: "\e626";
+}
+.icon-brick-menu:before {
+	content: "\e621";
+}
+.icon-folder-menu:before {
+	content: "\e622";
+}
+.icon-jenkins-head:before {
+	content: "\e617";
+}
+.icon-jenkins:before {
+	content: "\e618";
+}
+.icon-jenkins-o:before {
+	content: "\e619";
+}
+.icon-brick:before {
+	content: "\e61a";
+}
+.icon-checkbox-checked:before {
+	content: "\e623";
+}
+.icon-phone:before {
+	content: "\e642";
+}
+.icon-checkmark:before {
+	content: "\e681";
+}
+.icon-map-pin-fill:before {
+	content: "\e678";
+}
+.icon-box-add:before {
+	content: "\e67d";
+}
+.icon-box-remove:before {
+	content: "\e67c";
+}
+.icon-clock:before {
+	content: "\e661";
+}
+.icon-plug:before {
+	content: "\e64e";
+}
+.icon-refresh:before {
+	content: "\e679";
+}
+.icon-search:before {
+	content: "\e63f";
+}
+.icon-move:before {
+	content: "\e615";
+}
+.icon-bug:before {
+	content: "\e611";
+}
+.icon-tools:before {
+	content: "\e669";
+}
+.icon-pulse:before {
+	content: "\e655";
+}
+.icon-key:before {
+	content: "\e653";
+}
+.icon-lock:before {
+	content: "\e64b";
+}
+.icon-gear:before {
+	content: "\e624";
+}
+.icon-repo-forked:before {
+	content: "\e610";
+}
+.icon-issue-closed:before {
+	content: "\e608";
+}
+.icon-lightning:before {
+	content: "\e603";
+}
+.icon-rainy:before {
+	content: "\e604";
+}
+.icon-cloud:before {
+	content: "\e605";
+}
+.icon-cloudy:before {
+	content: "\e606";
+}
+.icon-sun:before {
+	content: "\e607";
+}
+.icon-office:before {
+	content: "\e600";
+}
+.icon-quill:before {
+	content: "\e62e";
+}
+.icon-book:before {
+	content: "\e63c";
+}
+.icon-copy:before {
+	content: "\e66e";
+}
+.icon-copy2:before {
+	content: "\e66f";
+}
+.icon-tag:before {
+	content: "\e61c";
+}
+.icon-support:before {
+	content: "\e66c";
+}
+.icon-phone2:before {
+	content: "\e66d";
+}
+.icon-map:before {
+	content: "\e651";
+}
+.icon-stopwatch:before {
+	content: "\e648";
+}
+.icon-mobile:before {
+	content: "\e643";
+}
+.icon-users:before {
+	content: "\e641";
+}
+.icon-wrench:before {
+	content: "\e66a";
+}
+.icon-settings:before {
+	content: "\e614";
+}
+.icon-hammer:before {
+	content: "\e601";
+}
+.icon-aid:before {
+	content: "\e654";
+}
+.icon-pie:before {
+	content: "\e65b";
+}
+.icon-stats:before {
+	content: "\e639";
+}
+.icon-bars:before {
+	content: "\e65c";
+}
+.icon-rocket:before {
+	content: "\e649";
+}
+.icon-remove:before {
+	content: "\e664";
+}
+.icon-signup:before {
+	content: "\e682";
+}
+.icon-download:before {
+	content: "\e670";
+}
+.icon-globe:before {
+	content: "\e652";
+}
+.icon-flag:before {
+	content: "\e644";
+}
+.icon-cancel-circle:before {
+	content: "\e665";
+}
+.icon-loop:before {
+	content: "\e65d";
+}
+.icon-insert-template:before {
+	content: "\e64d";
+}
+.icon-console:before {
+	content: "\e628";
+}
+.icon-file-css:before {
+	content: "\e629";
+}
+.icon-screen:before {
+	content: "\e60b";
+}
+.icon-help:before {
+	content: "\e67a";
+}
+.icon-feather-o:before {
+	content: "\e62f";
+}
+.icon-compass:before {
+	content: "\e61d";
+}
+.icon-graduation:before {
+	content: "\e65a";
+}
+.icon-box:before {
+	content: "\e63b";
+}
+.icon-flow-cascade:before {
+	content: "\e61e";
+}
+.icon-flow-branch:before {
+	content: "\e60c";
+}
+.icon-flow-tree:before {
+	content: "\e60d";
+}
+.icon-calendar-o:before {
+	content: "\e662";
+}
+.icon-ban:before {
+	content: "\e64c";
+}
+.icon-flag-checkered:before {
+	content: "\e645";
+}
+.icon-envelope-o:before {
+	content: "\e63d";
+}
+.icon-envelope:before {
+	content: "\e63e";
+}
+.icon-cog:before {
+	content: "\e625";
+}
+.icon-puzzle-piece:before {
+	content: "\e61f";
+}
+.icon-folder-open-o:before {
+	content: "\e60e";
+}
+.icon-folder-o:before {
+	content: "\e60f";
+}
+.icon-thumbs-o-down:before {
+	content: "\e609";
+}
+.icon-thumbs-o-up:before {
+	content: "\e60a";
+}
+.icon-enlarge:before {
+	content: "\e650";
+}
+.icon-shield:before {
+	content: "\e646";
+}
+.icon-factory:before {
+	content: "\e616";
+}
+.icon-unlocked:before {
+	content: "\e612";
+}
+.icon-locked:before {
+	content: "\e613";
+}
+.icon-uniE602:before {
+	content: "\e602";
+}
diff --git a/war/src/main/webapp/css/icons/icomoon/icomoon.eot b/war/src/main/webapp/css/icons/icomoon/icomoon.eot
new file mode 100644
index 0000000000..06ac51bcaf
Binary files /dev/null and b/war/src/main/webapp/css/icons/icomoon/icomoon.eot differ
diff --git a/war/src/main/webapp/css/icons/icomoon/icomoon.svg b/war/src/main/webapp/css/icons/icomoon/icomoon.svg
new file mode 100644
index 0000000000..896baa7f44
--- /dev/null
+++ b/war/src/main/webapp/css/icons/icomoon/icomoon.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="512">
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#x20;" horiz-adv-x="256" d="" />
+<glyph unicode="&#xe600;" glyph-name="office" d="M0-32h256v512h-256v-512zM160 416h64v-64h-64v64zM160 288h64v-64h-64v64zM160 160h64v-64h-64v64zM32 416h64v-64h-64v64zM32 288h64v-64h-64v64zM32 160h64v-64h-64v64zM288 320h224v-32h-224zM288-32h64v128h96v-128h64v288h-224z" />
+<glyph unicode="&#xe601;" glyph-name="hammer" d="M7.002 65.512l150.772 150.772c9.334 9.334 24.607 9.334 33.941 0l11.313-11.313 92 92-151.028 151.029h160l71.029-71.029 7.030 7.029h33.941v-33.941l-7.029-7.029 103.029-103.030-80-80-103.029 103.029-92-92 11.313-11.313c9.334-9.334 9.334-24.607 0-33.941l-150.772-150.772c-9.334-9.334-24.607-9.334-33.941 0l-56.568 56.568c-9.335 9.333-9.335 24.607-0.001 33.941z" />
+<glyph unicode="&#xe602;" glyph-name="uniE602" d="M373.333 368c0-14.72 11.947-26.667 26.667-26.667s26.667 11.947 26.667 26.667-11.947 26.667-26.667 26.667-26.667-11.947-26.667-26.667zM373.333 197.333c0-14.72 11.947-26.667 26.667-26.667s26.667 11.947 26.667 26.667-11.947 26.667-26.667 26.667-26.667-11.947-26.667-26.667zM0 128c0-23.573 19.093-42.667 42.667-42.667h181.333v-29.44c-5.227-3.52-9.707-8-13.227-13.227l-130.773 0.001c-14.72 0-26.667-11.947-26.667-26.667s11.947-26.667 26.667-26.667h130.773c8.64-12.907 23.253-21.333 39.893-21.333s31.253 8.427 39.893 21.333h141.441c14.72 0 26.667 11.947 26.667 26.667s-11.947 26.667-26.667 26.667h-141.44c-3.52 5.227-8 9.707-13.227 13.227v29.439h192c23.573 0 42.667 19.093 42.667 42.667v309.333c0 23.573-19.093 42.667-42.667 42.667h-426.666c-23.574 0-42.667-19.093-42.667-42.667v-309.333zM76.8 426.667h358.4c13.013 0 23.467-10.454 23.467-23.467v-70.4c0-13.013-10.453-23.467-23.467-23.467h-358.4c-13.013 0-23.467 10.454-23.467 23.467v70.4c0 13.013 10.454 23.467 23.467 23.467zM76.8 256h358.4c13.013 0 23.467-10.453 23.467-23.467v-70.4c0-13.013-10.453-23.467-23.467-23.467l-358.4 0.001c-13.013 0-23.467 10.453-23.467 23.466v70.4c0 13.014 10.454 23.467 23.467 23.467z" />
+<glyph unicode="&#xe603;" glyph-name="lightning" d="M192 96l32-32-32-96 96 96-32 32 32 64-96-64zM512 345.167c0 49.146-40 89.124-89.167 89.124-2.396 0-4.771-0.083-7.146-0.27-23.125 28.833-57.978 45.979-95.687 45.979-37.688 0-72.562-17.146-95.688-45.979-2.375 0.187-4.771 0.27-7.188 0.27-49.124 0-89.124-39.979-89.124-89.124 0-5.146 0.688-10.125 1.5-15.042-0.542-0.708-1.188-1.354-1.708-2.083-5.229 0.75-10.479 1.125-15.792 1.125-61.75 0-112-50.25-112-112s50.25-112 112-112c13.688 0 27.084 2.499 39.709 7.333 1.104-0.959 2.416-1.625 3.541-2.562l28.312 18.875c-9.438 6.688-18.25 14.125-25.625 23-13-9.146-28.812-14.646-45.938-14.646-44.188 0-80 35.791-80 80 0 44.167 35.812 80 80 80 10.812 0 21.062-2.209 30.438-6.083 0.562 1.083 1.25 2 1.812 3.042 5.625 10.271 12.562 19.667 20.666 28.042 23.084 23.896 55.167 39 91.084 39 49.709 0 92.334-28.667 113.541-70.083 5.646 2.333 11.668 3.833 17.875 4.833l12.584 1.25c12.334 0 23.875-3.042 34.312-8 11.312-5.417 21.021-13.375 28.646-23.208 10.5-13.521 17.042-30.334 17.042-48.792 0-44.209-35.812-80-80-80-17.125 0-32.916 5.5-45.938 14.646-14-16.875-32.438-29.562-53.146-37.562l-5.979-11.938 18.25-18.25c17.062 6.646 33.021 16.188 47.104 28.438 12.625-4.834 26.021-7.333 39.709-7.333 61.75 0 112 50.249 112 112 0 25.666-9.042 49.083-23.666 68 14.583 15.873 23.667 36.81 23.667 59.998zM465.562 307.542c-18.479 13.438-41 21.625-65.562 21.625-5.312 0-10.562-0.375-15.792-1.125-29.874 40.687-77.020 65.125-128.208 65.125-34.125 0-66.312-11.062-92.938-30.354 7.479 22.853 28.729 39.478 54.062 39.478 7.75 0 15.062-1.562 21.75-4.333 15.188 29.584 45.626 50.042 81.126 50.042s65.958-20.458 81.084-50.042c6.729 2.771 14.083 4.333 21.749 4.333 31.584 0 57.167-25.583 57.167-57.124 0-14.5-5.562-27.563-14.438-37.625z" />
+<glyph unicode="&#xe604;" glyph-name="rainy" d="M400 416c-5.312 0-10.562-0.375-15.792-1.125-29.874 40.708-77.020 65.125-128.208 65.125s-98.312-24.417-128.208-65.125c-5.23 0.75-10.48 1.125-15.792 1.125-61.75 0-112-50.25-112-112s50.25-112 112-112c13.688 0 27.084 2.5 39.709 7.333 28.957-25.25 65.791-39.333 104.291-39.333 38.542 0 75.333 14.083 104.291 39.333 12.625-4.833 26.021-7.333 39.709-7.333 61.75 0 112 50.25 112 112s-50.25 112-112 112zM400 224c-17.125 0-32.916 5.5-45.938 14.667-23.478-28.292-58.438-46.667-98.062-46.667s-74.584 18.375-98.062 46.667c-13-9.167-28.813-14.667-45.938-14.667-44.188 0-80 35.812-80 80s35.812 80 80 80c10.812 0 21.062-2.208 30.438-6.083 21.229 41.416 63.853 70.083 113.562 70.083s92.334-28.667 113.541-70.083c9.397 3.875 19.668 6.083 30.459 6.083 44.188 0 80-35.812 80-80s-35.812-80-80-80zM225 0c0-17.688 14.312-32 32-32s32 14.312 32 32-32 64-32 64-32-46.312-32-64zM352 32c0-17.688 14.312-32 32-32s32 14.312 32 32-32 64-32 64-32-46.312-32-64zM96 96c0-17.688 14.312-32 32-32s32 14.312 32 32-32 64-32 64-32-46.312-32-64z" />
+<glyph unicode="&#xe605;" glyph-name="cloud" d="M400 320c-5.312 0-10.562-0.375-15.792-1.125-29.874 40.708-77.020 65.125-128.208 65.125s-98.312-24.417-128.208-65.125c-5.23 0.75-10.48 1.125-15.792 1.125-61.75 0-112-50.25-112-112s50.25-112 112-112c13.688 0 27.084 2.5 39.709 7.333 28.957-25.25 65.791-39.333 104.291-39.333 38.542 0 75.333 14.083 104.291 39.333 12.625-4.833 26.021-7.333 39.709-7.333 61.75 0 112 50.25 112 112s-50.25 112-112 112zM400 128c-17.125 0-32.916 5.5-45.938 14.667-23.478-28.291-58.438-46.667-98.062-46.667s-74.584 18.376-98.062 46.667c-13-9.167-28.813-14.667-45.938-14.667-44.188 0-80 35.812-80 80s35.812 80 80 80c10.812 0 21.062-2.208 30.438-6.083 21.229 41.416 63.853 70.083 113.562 70.083s92.334-28.667 113.541-70.083c9.397 3.875 19.668 6.083 30.459 6.083 44.188 0 80-35.812 80-80s-35.812-80-80-80z" />
+<glyph unicode="&#xe606;" glyph-name="cloudy" d="M208 416c8.833 0 16 7.167 16 16v32c0 8.833-7.167 16-16 16s-16-7.167-16-16v-32c0-8.833 7.167-16 16-16zM332.438 373.833l22.625 22.625c6.249 6.25 6.249 16.375 0 22.625s-16.375 6.25-22.625 0l-22.625-22.625c-6.25-6.25-6.25-16.375 0-22.625s16.375-6.25 22.625 0zM16 256h32c8.833 0 16 7.167 16 16s-7.167 16-16 16h-32c-8.833 0-16-7.167-16-16s7.167-16 16-16zM352 272c0-8.833 7.167-16 16-16h32c8.833 0 16 7.167 16 16s-7.167 16-16 16h-32c-8.833 0-16-7.167-16-16zM83.541 373.833c6.251-6.25 16.376-6.25 22.625 0 6.251 6.25 6.251 16.375 0 22.625l-22.625 22.625c-6.25 6.25-16.374 6.25-22.625 0-6.25-6.25-6.25-16.375 0-22.625l22.625-22.625zM400 224c-5.312 0-10.562-0.375-15.792-1.125-16.771 22.875-39.124 40.333-64.458 51.5-1.291 60.625-50.812 109.625-111.75 109.625-61.75 0-112-50.25-112-112 0-17.438 4.334-33.75 11.5-48.438-59.625-2.437-107.5-51.374-107.5-111.562 0-61.75 50.25-112 112-112 13.688 0 27.084 2.5 39.709 7.333 28.957-25.25 65.791-39.333 104.291-39.333 38.542 0 75.333 14.083 104.291 39.333 12.625-4.833 26.021-7.333 39.709-7.333 61.75 0 112 50.25 112 112s-50.25 112-112 112zM208 352c39.812 0 72.562-29.167 78.708-67.25-10.021 2-20.249 3.25-30.708 3.25-45.938 0-88.5-19.812-118.375-53.25-5.937 11.167-9.625 23.708-9.625 37.25 0 44.188 35.812 80 80 80zM400 32c-17.125 0-32.916 5.5-45.938 14.667-23.478-28.292-58.438-46.667-98.062-46.667s-74.584 18.375-98.062 46.667c-13-9.167-28.813-14.667-45.938-14.667-44.188 0-80 35.812-80 80s35.812 80 80 80c7.75 0 15.062-1.458 22.125-3.541 2.812-0.792 5.667-1.417 8.312-2.521 4.375 8.562 9.875 16.396 15.979 23.75 23.376 28.124 58.146 46.312 97.584 46.312 10.125 0 19.834-1.458 29.25-3.709 10.562-2.499 20.542-6.291 29.834-11.291 23.291-12.375 42.416-31.542 54.457-55.063 9.397 3.875 19.668 6.063 30.459 6.063 44.188 0 80-35.812 80-80s-35.812-80-80-80z" />
+<glyph unicode="&#xe607;" glyph-name="sun" d="M256 336c-61.75 0-112-50.25-112-112s50.25-112 112-112 112 50.25 112 112c0 61.75-50.25 112-112 112zM256 144c-44.188 0-80 35.812-80 80s35.812 80 80 80 80-35.812 80-80-35.812-80-80-80zM256 368c8.833 0 16 7.167 16 16v32c0 8.833-7.167 16-16 16s-16-7.167-16-16v-32c0-8.833 7.167-16 16-16zM256 80c-8.833 0-16-7.167-16-16v-32c0-8.833 7.167-16 16-16s16 7.167 16 16v32c0 8.833-7.167 16-16 16zM380.438 325.833l22.625 22.625c6.25 6.25 6.25 16.375 0 22.625s-16.375 6.25-22.625 0l-22.625-22.625c-6.25-6.25-6.25-16.375 0-22.625s16.375-6.25 22.625 0zM131.562 122.166l-22.625-22.625c-6.25-6.249-6.25-16.374 0-22.624s16.375-6.25 22.625 0l22.625 22.624c6.25 6.271 6.25 16.376 0 22.625-6.249 6.251-16.375 6.272-22.625 0zM112 224c0 8.833-7.167 16-16 16h-32c-8.833 0-16-7.167-16-16s7.167-16 16-16h32c8.833 0 16 7.167 16 16zM448 240h-32c-8.833 0-16-7.167-16-16s7.167-16 16-16h32c8.833 0 16 7.167 16 16s-7.167 16-16 16zM131.541 325.833c6.251-6.25 16.376-6.25 22.625 0 6.251 6.25 6.251 16.375 0 22.625l-22.625 22.625c-6.25 6.25-16.374 6.25-22.625 0-6.25-6.25-6.25-16.375 0-22.625l22.625-22.625zM380.459 122.188c-6.271 6.25-16.376 6.25-22.625 0-6.251-6.25-6.271-16.375 0-22.625l22.625-22.625c6.249-6.25 16.374-6.25 22.624 0s6.25 16.374 0 22.625l-22.624 22.625z" />
+<glyph unicode="&#xe608;" glyph-name="issue-closed" d="M352 321.985l-48-48 80-81.985 128 128-48 48-79.375-79.39-32.625 33.375zM256 64c-88.391 0-160 71.625-160 160 0 88.39 71.609 160 160 160 44.188 0 84.188-17.922 113.125-46.875l45.281 45.25c-40.531 40.563-96.531 65.625-158.406 65.625-123.719 0-224-100.281-224-224s100.281-224 224-224c123.719 0 224 100.281 224 224l-100.125-100.125c4.469 5.5-37.5-59.875-123.875-59.875zM288 352h-64v-160h64v160zM224 96h64v64h-64v-64z" />
+<glyph unicode="&#xe609;" glyph-name="thumbs-o-down" d="M73.143 347.429q0 7.428-5.428 12.857t-12.857 5.428-12.857-5.428-5.428-12.857 5.428-12.857 12.857-5.428 12.857 5.428 5.428 12.857zM402.286 182.857q0 10-6.143 23.143t-15.286 13.428q4.286 4.857 7.143 13.572t2.857 15.857q0 19.715-15.143 34 5.143 9.143 5.143 19.715t-5 21-13.572 15q1.428 8.572 1.428 16 0 24.285-14 36t-38.857 11.714h-36.572q-37.428 0-97.714-20.857-1.429-0.571-8.286-3t-10.143-3.571-10-3.286-10.857-3.143-9.428-1.857-9-0.857h-9.143v-182.857h9.143q4.572 0 10.143-2.572t11.428-7.714 11-10.143 11.428-12.572 9.857-12.143 9-11.714 6.571-8.572q15.714-19.428 22-26 11.714-12.286 17-31.286t8.714-35.857 10.857-24.286q27.429 0 36.571 13.428t9.143 41.428q0 16.857-13.714 45.857t-13.714 45.572h100.572q14.286 0 25.428 11t11.143 25.572zM438.857 182.572q0-29.428-21.714-51.143t-51.428-21.714h-50.286q13.714-28.286 13.714-54.857 0-33.714-10-53.143-10-19.714-29.143-29t-43.143-9.285q-14.571 0-25.715 10.572-9.714 9.428-15.428 23.428t-7.286 25.857-5 24.143-8.857 18.286q-13.714 14.286-30.571 36.286-28.857 37.428-39.143 44.286h-78.285q-15.143 0-25.857 10.714t-10.714 25.857v182.857q0 15.143 10.714 25.857t25.857 10.714h82.285q6.285 0 39.429 11.428 36.572 12.572 63.714 18.857t57.143 6.286h32q40 0 64.714-22.572t24.428-61.715v-1.428q17.143-22 17.143-50.857 0-6.286-0.857-12.286 10.857-19.143 10.857-41.143 0-10.286-2.572-19.714 14-21.143 14-46.572z" />
+<glyph unicode="&#xe60a;" glyph-name="thumbs-o-up" d="M73.143 91.429q0 7.428-5.428 12.857t-12.857 5.428-12.857-5.428-5.428-12.857 5.428-12.857 12.857-5.428 12.857 5.428 5.428 12.857zM402.286 256q0 14.572-11.143 25.572t-25.428 11h-100.572q0 16.572 13.714 45.572t13.714 45.857q0 28-9.143 41.429t-36.572 13.428q-7.428-7.428-10.857-24.286t-8.714-35.857-17-31.285q-6.286-6.572-22-26-1.143-1.429-6.571-8.572t-9-11.714-9.857-12.143-11.429-12.571-11-10.143-11.428-7.714-10.143-2.571h-9.143v-182.857h9.143q3.715 0 9-0.857t9.429-1.857 10.857-3.143 10-3.286 10.143-3.572 8.286-3q60.286-20.857 97.714-20.857h34.572q54.857 0 54.857 47.714 0 7.428-1.428 16 8.572 4.572 13.572 15t5 21-5.143 19.714q15.143 14.286 15.143 34 0 7.143-2.857 15.857t-7.143 13.572q9.143 0.286 15.286 13.428t6.143 23.143zM438.857 256.286q0-25.428-14-46.571 2.572-9.428 2.572-19.714 0-22-10.857-41.143 0.857-6 0.857-12.286 0-28.857-17.143-50.857 0.286-39.714-24.286-62.714t-64.857-23h-36.857q-27.428 0-54.143 6.428t-61.857 18.714q-33.143 11.428-39.428 11.428h-82.285q-15.143 0-25.857 10.714t-10.714 25.857v182.857q0 15.143 10.714 25.857t25.857 10.714h78.285q10.285 6.857 39.143 44.286 16.572 21.428 30.572 36.571 6.857 7.143 10.143 24.429t8.714 36.143 17.715 30.857q11.143 10.571 25.714 10.571 24 0 43.143-9.285t29.143-29 10-53.143q0-26.572-13.714-54.857h50.286q29.714 0 51.428-21.714t21.714-51.143z" />
+<glyph unicode="&#xe60b;" glyph-name="screen" d="M480 480h-448c-17.672 0-32-14.312-32-32v-352c0-17.688 14.328-32 32-32h192v-32h-96c-17.672 0-32-14.312-32-32v-32h320v32c0 17.688-14.328 32-32 32h-96v32h192c17.672 0 32 14.312 32 32v352c0 17.688-14.328 32-32 32zM448 128h-384v288h384v-288z" />
+<glyph unicode="&#xe60c;" glyph-name="flow-branch" d="M419.84 384c0 33.92-27.495 61.44-61.44 61.44s-61.44-27.52-61.44-61.44c0-24.909 14.848-46.31 36.147-55.962-5.811-49.869-37.939-59.929-84.352-74.419-22.528-7.040-48.717-15.232-70.835-31.155v105.114c21.837 9.447 37.12 31.155 37.12 56.422 0 33.92-27.52 61.44-61.44 61.44-33.946 0-61.44-27.52-61.44-61.44 0-25.267 15.283-46.976 37.12-56.422v-194.381c-21.837-9.395-37.12-31.104-37.12-56.397 0-33.92 27.495-61.44 61.44-61.44 33.92 0 61.44 27.52 61.44 61.44 0 24.909-14.848 46.31-36.173 55.962 5.837 49.869 37.99 59.955 84.377 74.419 47.181 14.745 110.745 34.637 118.63 120.039 22.272 9.267 37.965 31.181 37.965 56.781zM118.144 384c0 19.584 15.872 35.456 35.456 35.456s35.456-15.872 35.456-35.456-15.872-35.456-35.456-35.456-35.456 15.872-35.456 35.456zM153.6 41.344c-19.584 0-35.456 15.872-35.456 35.456s15.872 35.456 35.456 35.456 35.456-15.872 35.456-35.456-15.872-35.456-35.456-35.456zM358.4 348.544c-19.558 0-35.456 15.872-35.456 35.456s15.897 35.456 35.456 35.456 35.456-15.872 35.456-35.456-15.897-35.456-35.456-35.456z" />
+<glyph unicode="&#xe60d;" glyph-name="flow-tree" d="M459.495 107.623v58.777c0 35.507-23.501 88.32-88.294 88.32h-51.2c-36.147 0-39.501 17.715-39.68 26.88v71.577c21.837 9.446 37.12 31.155 37.12 56.422 0 33.92-27.495 61.44-61.44 61.44s-61.44-27.52-61.44-61.44c0-25.267 15.283-46.976 37.12-56.422v-71.577c0-6.631-1.92-26.88-39.68-26.88h-51.2c-64.793 0-88.32-52.813-88.32-88.32v-58.778c-21.837-9.421-37.12-31.155-37.12-56.423 0-33.92 27.494-61.44 61.44-61.44 33.92 0 61.44 27.52 61.44 61.44 0 25.267-15.283 47.002-37.12 56.423v58.778c0 6.63 1.92 39.68 39.68 39.68h51.2c15.539 0 28.647 2.355 39.68 6.349v-104.807c-21.837-9.421-37.12-31.155-37.12-56.423 0-33.92 27.494-61.44 61.44-61.44s61.44 27.52 61.44 61.44c0 25.267-15.309 47.002-37.145 56.423v104.807c11.034-3.993 24.141-6.349 39.68-6.349h51.2c36.147 0 39.501-30.515 39.706-39.68v-58.778c-21.837-9.421-37.12-31.155-37.12-56.423 0-33.92 27.495-61.44 61.44-61.44s61.44 27.52 61.44 61.44c0 25.267-15.283 47.002-37.145 56.423zM112.256 51.2c0-19.584-15.872-35.456-35.456-35.456s-35.456 15.872-35.456 35.456 15.872 35.456 35.456 35.456 35.456-15.872 35.456-35.456zM220.544 409.6c0 19.584 15.898 35.456 35.456 35.456s35.43-15.872 35.43-35.456-15.872-35.456-35.43-35.456c-19.559 0-35.456 15.872-35.456 35.456zM291.456 51.2c0-19.584-15.897-35.456-35.43-35.456-19.584 0-35.456 15.872-35.456 35.456s15.872 35.456 35.43 35.456c19.558 0 35.456-15.872 35.456-35.456zM435.2 15.744c-19.558 0-35.456 15.872-35.456 35.456s15.897 35.456 35.456 35.456 35.456-15.872 35.456-35.456-15.897-35.456-35.456-35.456z" />
+<glyph unicode="&#xe60e;" glyph-name="folder-open-o" horiz-adv-x="549" d="M508.857 209.429q0 10-15.143 10h-310.857q-11.428 0-24.428-6.143t-20.428-15l-84-103.714q-5.143-6.857-5.143-11.428 0-10 15.143-10h310.857q11.428 0 24.572 6.286t20.286 15.143l84 103.714q5.143 6.286 5.143 11.143zM182.857 256h219.429v45.715q0 11.428-8 19.428t-19.428 8h-164.571q-11.429 0-19.429 8t-8 19.428v18.286q0 11.428-8 19.428t-19.428 8h-91.428q-11.428 0-19.428-8t-8-19.428v-243.714l73.143 90q12.572 15.143 33.143 25t40 9.857zM545.428 209.429q0-17.714-13.143-34.286l-84.286-103.714q-12.286-15.143-33.143-25t-40-9.857h-310.857q-26.285 0-45.143 18.857t-18.857 45.143v274.286q0 26.286 18.857 45.143t45.143 18.857h91.428q26.286 0 45.143-18.857t18.857-45.143v-9.143h155.429q26.286 0 45.143-18.857t18.857-45.143v-45.714h54.857q15.428 0 28.285-7t19.143-20.143q4.285-9.143 4.285-19.428z" />
+<glyph unicode="&#xe60f;" glyph-name="folder-o" horiz-adv-x="476" d="M438.857 100.572v201.143q0 11.429-8 19.429t-19.428 8h-201.143q-11.429 0-19.429 8t-8 19.428v18.286q0 11.428-8 19.428t-19.428 8h-91.428q-11.428 0-19.428-8t-8-19.428v-274.286q0-11.428 8-19.428t19.428-8h347.428q11.428 0 19.428 8t8 19.428zM475.428 301.714v-201.143q0-26.286-18.857-45.143t-45.143-18.857h-347.428q-26.285 0-45.143 18.857t-18.857 45.143v274.286q0 26.286 18.857 45.143t45.143 18.857h91.428q26.286 0 45.143-18.857t18.857-45.143v-9.143h192q26.286 0 45.143-18.857t18.857-45.143z" />
+<glyph unicode="&#xe610;" glyph-name="repo-forked" horiz-adv-x="384" d="M384 416c0 35.5-28.5 64-64 64s-64-28.5-64-64c0-23.5 13-44.5 32-55.5v-53l-96-106-96 106v53c19 11 32 31.5 32 55.5 0 35.5-28.5 64-64 64s-64-28.5-64-64c0-23.5 13-44.5 32-55.5v-78l128-141v-54.5c-19-11-32-31.5-32-55.5 0-35.5 28.5-64 64-64s64 28.5 64 64c0 23.5-13 44.5-32 55.5v54.5l128 141v78c19 11 32 31.5 32 55.5zM64 447.5c17 0 31-14 31-31s-14-31-31-31-31 14-31 31 14 31 31 31zM192 2c-17 0-31 14-31 31s14 31 31 31 31-14 31-31-14-31-31-31zM320 447.5c17 0 31-14 31-31s-14-31-31-31-31 14-31 31 14 31 31 31z" />
+<glyph unicode="&#xe611;" glyph-name="bug" d="M496 240h-82.368c-2.912 21.712-8.816 42.096-16.944 60.688l51.312 51.312c8.848 0 16 7.168 16 16v80c0 8.832-7.152 16-16 16s-16-7.168-16-16v-80l-52.896-35.264c-8.144 12.016-17.328 22.912-27.6 32.080-4.816 64.672-45.728 115.184-95.504 115.184s-90.688-50.512-95.52-115.184c-10.256-9.152-19.456-20.048-27.584-32.080l-52.896 35.264v80c0 8.832-7.168 16-16 16s-16-7.168-16-16v-80c0-8.832 7.168-16 16-16l51.312-51.312c-8.128-18.592-14.032-38.976-16.944-60.688h-82.368c-8.832 0-16-7.152-16-16s7.168-16 16-16h82.288c1.776-13.344 4.752-58.16 8.592-70.4l-46.672-58.368c-6.96-1.76-12.208-7.744-12.208-15.232v-80c0-8.848 7.168-16 16-16s16 7.152 16 16v80l40.336 40.336c27.008-53.056 74-88.336 127.664-88.336 2.704 0 5.328 0.48 8 0.672 2.672-0.192 5.296-0.672 8-0.672 53.664 0 100.656 35.28 127.664 88.336l40.336-40.336v-80c0-8.848 7.152-16 16-16s16 7.152 16 16v80c0 7.488-5.248 13.472-12.192 15.216l-46.688 58.384c3.84 12.256 6.816 57.056 8.592 70.4h82.288c8.848 0 16 7.152 16 16s-7.152 16-16 16z" />
+<glyph unicode="&#xe612;" glyph-name="unlocked" d="M42.667 10.667c0-23.573 19.093-42.667 42.667-42.667h341.333c23.573 0 42.667 19.093 42.667 42.667l-0.001 213.333c0 23.573-19.093 42.667-42.667 42.667h-255.999v74.667c0 47.147 38.187 85.333 85.333 85.333s85.333-38.187 85.333-85.333v-5.333c0-14.72 11.947-26.667 26.667-26.667s26.667 11.947 26.667 26.667v5.332c0 76.587-62.080 138.667-138.667 138.667-76.597 0-138.667-62.080-138.667-138.667v-74.667l-32 0.001c-23.573 0-42.667-19.093-42.667-42.667l0.001-213.333zM213.333 149.333c0 23.573 19.093 42.667 42.667 42.667s42.667-19.093 42.667-42.667c0-15.040-7.787-28.267-19.52-35.84 0 0 4.171-25.173 8.853-54.827 0-8.853-7.147-16-16-16h-32c-8.853 0-16 7.147-16 16l8.853 54.827c-11.733 7.574-19.52 20.8-19.52 35.84z" />
+<glyph unicode="&#xe613;" glyph-name="locked" d="M117.333 341.333v-74.667l-32 0.001c-23.573 0-42.667-19.093-42.667-42.667v-213.333c0-23.573 19.093-42.667 42.667-42.667h341.333c23.573 0 42.667 19.093 42.667 42.667v213.333c0 23.573-19.093 42.667-42.667 42.667h-32v74.667c0 76.587-62.080 138.667-138.667 138.667-76.586-0.001-138.666-62.081-138.666-138.668zM170.667 266.667v74.667c0 47.147 38.187 85.333 85.333 85.333s85.333-38.187 85.333-85.333v-74.667h-170.666zM213.333 149.333c0 23.573 19.093 42.667 42.667 42.667s42.667-19.093 42.667-42.667c0-15.040-7.787-28.267-19.52-35.84 0 0 4.171-25.173 8.853-54.827 0-8.853-7.147-16-16-16h-32c-8.853 0-16 7.147-16 16l8.853 54.827c-11.733 7.574-19.52 20.8-19.52 35.84z" />
+<glyph unicode="&#xe614;" glyph-name="settings" d="M224 416v8c0 13.2-10.8 24-24 24h-80c-13.2 0-24-10.8-24-24v-8h-96v-64h96v-8c0-13.2 10.8-24 24-24h80c13.2 0 24 10.8 24 24v8h288v64h-288zM128 352v64h64v-64h-64zM416 264c0 13.2-10.8 24-24 24h-80c-13.2 0-24-10.8-24-24v-8h-288v-64h288v-8c0-13.2 10.8-24 24-24h80c13.2 0 24 10.8 24 24v8h96v64h-96v8zM320 192v64h64v-64h-64zM224 104c0 13.2-10.8 24-24 24h-80c-13.2 0-24-10.8-24-24v-8h-96v-64h96v-8c0-13.2 10.8-24 24-24h80c13.2 0 24 10.8 24 24v8h288v64h-288v8zM128 32v64h64v-64h-64z" />
+<glyph unicode="&#xe615;" glyph-name="move" d="M287.744 385.264v-129.008h128v64l96.256-96.256-96.256-96.24v65.488h-128v-129.008h64.496l-96.24-96.24-96.256 96.24h64v129.008h-128v-64.992l-95.744 95.744 95.744 95.744v-63.488h128v129.008h-62.496l94.752 94.736 94.752-94.736h-63.008z" />
+<glyph unicode="&#xe616;" glyph-name="factory" d="M512 288.213c0 11.627-9.6 21.12-21.333 21.12-5.867 0-11.2-2.357-15.040-6.187l-91.627-78.837v63.893c0 11.638-9.6 21.131-21.333 21.131-5.867 0-11.2-2.357-15.040-6.187l-91.627-78.837v63.893c0 11.638-9.6 21.131-21.333 21.131-5.867 0-11.2-2.357-15.040-6.187l-92.587-79.573-20.373 232.96c0 13.014-10.454 23.467-23.467 23.467h-38.4c-13.013 0-23.467-10.453-23.467-23.467l-21.333-445.866c0-23.573 19.093-42.667 42.667-42.667h426.667c23.573 0 42.667 19.093 42.667 42.667l-0.001 277.546zM202.667 150.72v-24.107c0-10.987-8.96-19.947-19.947-19.947h-24.107c-10.986 0.001-19.946 8.961-19.946 19.947v24.107c0 10.987 8.96 19.947 19.947 19.947h24.107c10.986 0 19.946-8.96 19.946-19.947zM330.667 150.72v-24.107c0-10.987-8.96-19.947-19.947-19.947h-24.107c-10.986 0.001-19.946 8.961-19.946 19.947v24.107c0 10.987 8.96 19.947 19.947 19.947h24.107c10.986 0 19.946-8.96 19.946-19.947zM458.667 150.72v-24.107c0-10.987-8.96-19.947-19.947-19.947h-24.107c-10.986 0.001-19.946 8.961-19.946 19.947v24.107c0 10.987 8.96 19.947 19.947 19.947h24.107c10.986 0 19.946-8.96 19.946-19.947z" />
+<glyph unicode="&#xe617;" glyph-name="jenkins-head" d="M110.558 270.157c-12.948 5.414-25.403 1.49-27.52-14.080 14.776 22.228 6.951-24.87 15.975-33.075-0.054 9.137 0.481 18.921 3.026 27.733 5.993 20.746 16.261-11.079 21.678-14.188 2.519 12.493-1.802 26.721-13.159 33.61zM260.293 384.486c-31.688 26.473-59.776-41.651-51.149-44.058-0.351 0.098 26.893 27.699 30.334 29.904 6.326 4.050 36.342 0.837 20.815 14.154zM301.022 299.546c-8.3 12.867-16.576 25.554-23.911 39.040-5.414-15.301 22.966-44.831 5.854-46.162-6.838-0.533-30.137 5.209-29.442-5.207 1.346-20.255 65.142-13.793 47.498 12.329-0.051 0.077 19.61-29.031 0 0zM334.2 11.187c-7.577 0-7.577-11.725 0-11.725 7.603 0 7.603 11.725 0 11.725zM340.063-16c-7.577 0-7.577-11.75 0-11.75 7.606 0 7.606 11.75 0 11.75zM352.632 181.504c0 8.748-68.306 12.475-77.159 15.309 7.271-19.505 80.261-47.834 77.159-15.309 0 0.077 1.997-20.941 0 0zM311.519 152.935c-8.555 2.137-47.504 23.317-46.766 25.026-10.419-24.179 82.611-66.654 99.423-26-17.538-0.409-35.202-1.666-52.656 0.973-0.205 0.051 17.433-2.637 0 0zM403.372 242.637c0 9.067-66.558 82.558-62.157 84.377-19.041-8.197 31.396-67.141 37.666-75.174 10.43-13.366 13.422-24.412-5.747-32.653-29.837-12.825-40.678-18.055-55.726 8.474-29.286-38.464 90.688-39.257 85.965 14.976 0 0.051 2.176-24.986 0 0zM410.594 208.154c-18.091-6.776-53.409-12.623-50.56-38.784 32.671 1.063 30.402 31.959 50.56 38.784zM413.255 321.664c-2.222 4.144-4.231 17.255-9.37 17.255-0.387-5.77 10.716-35.53 5.863-37.635-2.255-0.976-27.389-1.923-25.058-6.38 6.274-11.986 25.971-10.752 34.69-3.464 9.856 8.243-2.271 22.402-6.126 30.224-0.028 0.051 8.036-16.307 0 0zM340.063-16c-7.577 0-7.577-11.75 0-11.75 7.606 0 7.606 11.75 0 11.75zM334.2 11.187c-7.577 0-7.577-11.725 0-11.725 7.603 0 7.603 11.725 0 11.725zM413.255 321.664c-2.222 4.144-4.231 17.255-9.37 17.255-0.387-5.77 10.716-35.53 5.863-37.635-2.255-0.976-27.389-1.923-25.058-6.38 6.274-11.986 25.971-10.752 34.69-3.464 9.856 8.243-2.271 22.402-6.126 30.224-0.028 0.051 8.036-16.307 0 0zM410.594 208.154c-18.091-6.776-53.409-12.623-50.56-38.784 32.671 1.063 30.402 31.959 50.56 38.784zM403.372 242.637c0 9.067-66.558 82.558-62.157 84.377-19.041-8.197 31.396-67.141 37.666-75.174 10.43-13.366 13.422-24.412-5.747-32.653-29.837-12.825-40.678-18.055-55.726 8.474-29.286-38.464 90.688-39.257 85.965 14.976 0 0.051 2.176-24.986 0 0zM311.519 152.935c-8.555 2.137-47.504 23.317-46.766 25.026-10.419-24.179 82.611-66.654 99.423-26-17.538-0.409-35.202-1.666-52.656 0.973-0.205 0.051 17.433-2.637 0 0zM352.632 181.504c0 8.748-68.306 12.475-77.159 15.309 7.271-19.505 80.261-47.834 77.159-15.309 0 0.077 1.997-20.941 0 0zM301.022 299.546c-8.3 12.867-16.576 25.554-23.911 39.040-5.414-15.301 22.966-44.831 5.854-46.162-6.838-0.533-30.137 5.209-29.442-5.207 1.346-20.255 65.142-13.793 47.498 12.329-0.051 0.077 19.61-29.031 0 0zM260.293 384.486c-31.688 26.473-59.776-41.651-51.149-44.058-0.351 0.098 26.893 27.699 30.334 29.904 6.326 4.050 36.342 0.837 20.815 14.154zM110.558 270.157c-12.948 5.414-25.403 1.49-27.52-14.080 14.776 22.228 6.951-24.87 15.975-33.075-0.054 9.137 0.481 18.921 3.026 27.733 5.993 20.746 16.261-11.079 21.678-14.188 2.519 12.493-1.802 26.721-13.159 33.61zM413.255 321.664c-2.222 4.144-4.231 17.255-9.37 17.255-0.387-5.77 10.716-35.53 5.863-37.635-2.255-0.976-27.389-1.923-25.058-6.38 6.274-11.986 25.971-10.752 34.69-3.464 9.856 8.243-2.271 22.402-6.126 30.224-0.028 0.051 8.036-16.307 0 0zM410.594 208.154c-18.091-6.776-53.409-12.623-50.56-38.784 32.671 1.063 30.402 31.959 50.56 38.784zM403.372 242.637c0 9.067-66.558 82.558-62.157 84.377-19.041-8.197 31.396-67.141 37.666-75.174 10.43-13.366 13.422-24.412-5.747-32.653-29.837-12.825-40.678-18.055-55.726 8.474-29.286-38.464 90.688-39.257 85.965 14.976 0 0.051 2.176-24.986 0 0zM311.519 152.935c-8.555 2.137-47.504 23.317-46.766 25.026-10.419-24.179 82.611-66.654 99.423-26-17.538-0.409-35.202-1.666-52.656 0.973-0.205 0.051 17.433-2.637 0 0zM352.632 181.504c0 8.748-68.306 12.475-77.159 15.309 7.271-19.505 80.261-47.834 77.159-15.309 0 0.077 1.997-20.941 0 0zM340.063-16c-7.577 0-7.577-11.75 0-11.75 7.606 0 7.606 11.75 0 11.75zM334.2 11.187c-7.577 0-7.577-11.725 0-11.725 7.603 0 7.603 11.725 0 11.725zM301.022 299.546c-8.3 12.867-16.576 25.554-23.911 39.040-5.414-15.301 22.966-44.831 5.854-46.162-6.838-0.533-30.137 5.209-29.442-5.207 1.346-20.255 65.142-13.793 47.498 12.329-0.051 0.077 19.61-29.031 0 0zM260.293 384.486c-31.688 26.473-59.776-41.651-51.149-44.058-0.351 0.098 26.893 27.699 30.334 29.904 6.326 4.050 36.342 0.837 20.815 14.154zM110.558 270.157c-12.948 5.414-25.403 1.49-27.52-14.080 14.776 22.228 6.951-24.87 15.975-33.075-0.054 9.137 0.481 18.921 3.026 27.733 5.993 20.746 16.261-11.079 21.678-14.188 2.519 12.493-1.802 26.721-13.159 33.61zM334.2 11.187c-7.577 0-7.577-11.725 0-11.725 7.603 0 7.603 11.725 0 11.725zM340.063-16c-7.577 0-7.577-11.75 0-11.75 7.606 0 7.606 11.75 0 11.75zM110.558 270.157c-12.948 5.414-25.403 1.49-27.52-14.080 14.776 22.228 6.951-24.87 15.975-33.075-0.054 9.137 0.481 18.921 3.026 27.733 5.993 20.746 16.261-11.079 21.678-14.188 2.519 12.493-1.802 26.721-13.159 33.61zM260.293 384.486c-31.688 26.473-59.776-41.651-51.149-44.058-0.351 0.098 26.893 27.699 30.334 29.904 6.326 4.050 36.342 0.837 20.815 14.154zM301.022 299.546c-8.3 12.867-16.576 25.554-23.911 39.040-5.414-15.301 22.966-44.831 5.854-46.162-6.838-0.533-30.137 5.209-29.442-5.207 1.346-20.255 65.142-13.793 47.498 12.329-0.051 0.077 19.61-29.031 0 0zM352.632 181.504c0 8.748-68.306 12.475-77.159 15.309 7.271-19.505 80.261-47.834 77.159-15.309 0 0.077 1.997-20.941 0 0zM311.519 152.935c-8.555 2.137-47.504 23.317-46.766 25.026-10.419-24.179 82.611-66.654 99.423-26-17.538-0.409-35.202-1.666-52.656 0.973-0.205 0.051 17.433-2.637 0 0zM403.372 242.637c0 9.067-66.558 82.558-62.157 84.377-19.041-8.197 31.396-67.141 37.666-75.174 10.43-13.366 13.422-24.412-5.747-32.653-29.837-12.825-40.678-18.055-55.726 8.474-29.286-38.464 90.688-39.257 85.965 14.976 0 0.051 2.176-24.986 0 0zM410.594 208.154c-18.091-6.776-53.409-12.623-50.56-38.784 32.671 1.063 30.402 31.959 50.56 38.784zM413.255 321.664c-2.222 4.144-4.231 17.255-9.37 17.255-0.387-5.77 10.716-35.53 5.863-37.635-2.255-0.976-27.389-1.923-25.058-6.38 6.274-11.986 25.971-10.752 34.69-3.464 9.856 8.243-2.271 22.402-6.126 30.224-0.028 0.051 8.036-16.307 0 0zM110.558 270.157c-12.948 5.414-25.403 1.49-27.52-14.080 14.776 22.228 6.951-24.87 15.975-33.075-0.054 9.137 0.481 18.921 3.026 27.733 5.993 20.746 16.261-11.079 21.678-14.188 2.519 12.493-1.802 26.721-13.159 33.61zM410.594 208.154c-18.091-6.776-53.409-12.623-50.56-38.784 32.671 1.063 30.402 31.959 50.56 38.784zM352.632 181.504c0 8.748-68.306 12.475-77.159 15.309 7.271-19.505 80.261-47.834 77.159-15.309 0 0.077 1.997-20.941 0 0zM349.074 168.115c1.203 0.026 2.534 0.077 3.993 0.154-1.331-0.077-2.663-0.128-3.993-0.154zM311.519 152.935c-8.555 2.137-47.504 23.317-46.766 25.026-10.419-24.179 82.611-66.654 99.423-26-17.538-0.409-35.202-1.666-52.656 0.973-0.205 0.051 17.433-2.637 0 0zM413.255 321.664c-2.222 4.144-4.231 17.255-9.37 17.255-0.387-5.77 10.716-35.53 5.863-37.635-2.255-0.976-27.389-1.923-25.058-6.38 6.274-11.986 25.971-10.752 34.69-3.464 9.856 8.243-2.271 22.402-6.126 30.224-0.028 0.051 8.036-16.307 0 0zM301.022 299.546c-8.3 12.867-16.576 25.554-23.911 39.040-5.414-15.301 22.966-44.831 5.854-46.162-6.838-0.533-30.137 5.209-29.442-5.207 1.346-20.255 65.142-13.793 47.498 12.329-0.051 0.077 19.61-29.031 0 0zM260.293 384.486c-31.688 26.473-59.776-41.651-51.149-44.058-0.351 0.098 26.893 27.699 30.334 29.904 6.326 4.050 36.342 0.837 20.815 14.154zM403.372 242.637c0 9.067-66.558 82.558-62.157 84.377-19.041-8.197 31.396-67.141 37.666-75.174 10.43-13.366 13.422-24.412-5.747-32.653-29.837-12.825-40.678-18.055-55.726 8.474-29.286-38.464 90.688-39.257 85.965 14.976 0 0.051 2.176-24.986 0 0zM334.2 11.187c-7.577 0-7.577-11.725 0-11.725 7.603 0 7.603 11.725 0 11.725zM340.063-16c-7.577 0-7.577-11.75 0-11.75 7.606 0 7.606 11.75 0 11.75zM110.558 270.157c-12.948 5.414-25.403 1.49-27.52-14.080 14.776 22.228 6.951-24.87 15.975-33.075-0.054 9.137 0.481 18.921 3.026 27.733 5.993 20.746 16.261-11.079 21.678-14.188 2.519 12.493-1.802 26.721-13.159 33.61zM222.61 37.606c0.154-1.639 0.41-3.274 0.743-4.941-0.307 1.639-0.563 3.277-0.743 4.941zM260.293 384.486c-31.688 26.473-59.776-41.651-51.149-44.058-0.351 0.098 26.893 27.699 30.334 29.904 6.326 4.050 36.342 0.837 20.815 14.154zM301.022 299.546c-8.3 12.867-16.576 25.554-23.911 39.040-5.414-15.301 22.966-44.831 5.854-46.162-6.838-0.533-30.137 5.209-29.442-5.207 1.346-20.255 65.142-13.793 47.498 12.329-0.051 0.077 19.61-29.031 0 0zM334.2 11.187c-7.577 0-7.577-11.725 0-11.725 7.603 0 7.603 11.725 0 11.725zM340.063-16c-7.577 0-7.577-11.75 0-11.75 7.606 0 7.606 11.75 0 11.75zM311.519 152.935c-8.555 2.137-47.504 23.317-46.766 25.026-10.419-24.179 82.611-66.654 99.423-26-17.538-0.409-35.202-1.666-52.656 0.973-0.205 0.051 17.433-2.637 0 0zM352.632 181.504c0 8.748-68.306 12.475-77.159 15.309 7.271-19.505 80.261-47.834 77.159-15.309 0 0.077 1.997-20.941 0 0zM349.074 168.115c1.203 0.026 2.534 0.077 3.993 0.154-1.331-0.077-2.663-0.128-3.993-0.154zM403.372 242.637c0 9.067-66.558 82.558-62.157 84.377-19.041-8.197 31.396-67.141 37.666-75.174 10.43-13.366 13.422-24.412-5.747-32.653-29.837-12.825-40.678-18.055-55.726 8.474-29.286-38.464 90.688-39.257 85.965 14.976 0 0.051 2.176-24.986 0 0zM410.594 208.154c-18.091-6.776-53.409-12.623-50.56-38.784 32.671 1.063 30.402 31.959 50.56 38.784zM413.255 321.664c-2.222 4.144-4.231 17.255-9.37 17.255-0.387-5.77 10.716-35.53 5.863-37.635-2.255-0.976-27.389-1.923-25.058-6.38 6.274-11.986 25.971-10.752 34.69-3.464 9.856 8.243-2.271 22.402-6.126 30.224-0.028 0.051 8.036-16.307 0 0zM222.61 37.606c0.154-1.639 0.41-3.274 0.743-4.941-0.307 1.639-0.563 3.277-0.743 4.941zM413.255 321.664c-2.222 4.144-4.231 17.255-9.37 17.255-0.387-5.77 10.716-35.53 5.863-37.635-2.255-0.976-27.389-1.923-25.058-6.38 6.274-11.986 25.971-10.752 34.69-3.464 9.856 8.243-2.271 22.402-6.126 30.224-0.028 0.051 8.036-16.307 0 0zM410.565 208.154c-17.866-7.962-53.476-11.784-50.532-38.784 25.183 0.819 39.943 18.105 50.532 38.784zM357.701 201.523c14.254 4.457 59.323 22.090 44.053 45.072-5.074 7.642-62.756 79.504-60.539 80.42-19.041-8.197 31.396-67.141 37.666-75.174 10.43-13.366 13.422-24.412-5.747-32.653-29.837-12.825-40.678-18.055-55.726 8.474-22.303-29.289 21.123-32.154 40.294-26.137 19.481 6.093-16.154-5.069 0 0zM349.074 168.115c1.203 0.026 2.534 0.077 3.993 0.154-1.331-0.077-2.663-0.128-3.993-0.154zM352.632 181.504c0 8.748-68.306 12.475-77.159 15.309 7.271-19.505 80.261-47.834 77.159-15.309 0 0.077 1.997-20.941 0 0zM311.519 152.935c-8.555 2.137-47.504 23.317-46.766 25.026-10.419-24.179 82.611-66.654 99.423-26-17.538-0.409-35.202-1.666-52.656 0.973-0.205 0.051 17.433-2.637 0 0zM301.022 299.546c-8.3 12.867-16.576 25.554-23.911 39.040-5.414-15.301 22.966-44.831 5.854-46.162-6.838-0.533-30.137 5.209-29.442-5.207 1.346-20.255 65.142-13.793 47.498 12.329-0.051 0.077 19.61-29.031 0 0zM260.293 384.486c-31.688 26.473-59.776-41.651-51.149-44.058-0.351 0.098 26.893 27.699 30.334 29.904 6.326 4.050 36.342 0.837 20.815 14.154zM110.558 270.157c-12.948 5.414-25.403 1.49-27.52-14.080 14.776 22.228 6.951-24.87 15.975-33.075-0.054 9.137 0.481 18.921 3.026 27.733 5.993 20.746 16.261-11.079 21.678-14.188 2.519 12.493-1.802 26.721-13.159 33.61zM461.228 76.39c-9.098 35.917-72.24 40.363-44.874 84.608 31.777 51.402 33.918 122.563 23.749 180.464-22.485 128.038-152.12 168.397-262.784 121.915-53.048-22.285-115.553-76.329-112.353-138.368 1.613-31.255-14.892-60.928-8.809-91.070 2.962-14.669 9.234-29.007 19.638-39.969 8.028-8.433 27.776-11.21 32.422-21.284 4.59-9.956 21.2-45.079 14.062-54.2-14.507-18.545-59.541-38.341-80.921-48.993-28.093-13.993-27.438-32.899-17.303-60.805 6.569-18.089 8.036-47.982 33.362-40.689-11.333 34.025-31.887 68.322 2.191 91.382 32.551 22.029 63.35 56.784 94.423 20.769-20.593-9.211-95.232-26.483-88.858-55.296-0.476-2.988 7.921-33.572 5.215-22.175 9.459-39.842 8.074-34.683 46.031-34.683 12.121 0 24.243 0 36.365 0 21.248 0 4.327 21.712 19.166 24.525 5.832 1.108 1.536-25.273 1.613-24.525 16.886 0 33.772 0 50.657 0 35.011 0 20.749 2.084 43.973 22.666 1.165 1.031 19.213 12.567 19.213 14.71 12.342 12.342 28.352-40.512 42.88-37.376-7.378 17.375-15.060 34.937-27.241 49.613 10.115 10.649 29.89 12.306 42.365 5.289 17.984-10.112 10.877-39.063 8.092-54.902 3.712 10.46 3.722 46.82 20.483 51.684 37.476 10.875 5.291-44.834 1.559-51.684 17.943 0 35.886 0 53.824 0 9.354 0.003 35.438 94.303 31.859 108.393-10.163 40.115 5.197-20.454 0 0zM185.464 449.664c-0.236 0.051 9.677 3.715 9.762-1.82 0.069-4.692-78.904-55.728-89.582-57.264 14.398 31.473 48.387 49.139 79.821 59.085zM93.918 375.834c14.505 11.589 34.8 8.412 51.917 8.55-0.732-15.363-35.264-10.778-45.622-18.384-25.823-18.954 0.182-53.038-20.938-67.376-8.77 26.75-9.579 58.135 14.643 77.209 0.256 0.205-24.576-19.353 0 0zM210.859 62.003c-5.327 0.839-47.849 11.743-37.095 22.759 11.113-11.111 40.213 1.485 37.094-22.759zM165.726 98.611c-17.79 11.361-30.992 35.497-38.013 54.684-2.406 6.577 3.702 53.322 4.659 52.738-4.936 3.010-22.692-10.425-31.573-8.064-13.145 3.495-22.592 16.889-27.581 28.624-9.328 21.939-3.115 57.59 25.922 60.047 27.016 2.286 21.401-32.018 42.048-34.020 28.611-2.775 6.879 48.996 8.034 61.55 6.339 68.91 5.353 107.784 73.18 140.050 74.13 35.394 131.935-10.432 181.553-60.058-13.097 3.87-35.33-1.236-31.844-19.481 42.926 41.958 58.279-53.453 59.111-73.984 1.792-51.325-6.162-105.014-34.534-148.864-60.995-94.397-156.078-60.659-208.537 19.379 1.229-34.736 35.154-63.683 63.975-77.747-31.813 7.378-53.315-15.954-86.397 5.146-18.918 12.083 11.879-7.577 0 0zM279.954 45.414c46.318-1.925-6.5-39.309-22.81-46.211-39.422-16.694-36.262 60.941-34.458 67.126 9.403 36.767 58.109-8.423 78.413-9.984-0.379-9.904-15.373-8.197-21.146-10.931 49.36-2.048 5.786 2.739 0 0zM286.098 79.027c5.635 3.63 50.142 5.376 58.24 6.016-20.872-15.060-34.471-24.668-58.24-6.016 2.304 1.485 7.501-5.885 0 0zM310.238 42.394c-0.653 7.166 2.988 26.399 14.848 14.646 12.409-10.673-9.183-31.591-14.848-14.646zM393.055 44.851c-1.116-49.59-82.399 2.614-36.915 7.987-21.663 10.603-23.288 11.005 1.27 26.729 27.115 17.365 36.206-11.195 35.645-34.716-0.538-23.936 0.281 11.878 0 0zM444.844 54.582c-13.502 10.068-58.258 48.819-71.654 44.541 18.202 26.553 25.459 12.925 43.93-4.25 11.682-10.911 31.101-20.985 27.725-40.292-8.752 6.526 3.379 19.325 0 0zM409.003 286.183c17.538 6.003 7.741 52.736-5.12 52.736-0.387-5.77 10.716-35.53 5.863-37.635-2.255-0.976-27.389-1.923-25.058-6.38 3.587-6.846 17.36-11.102 24.315-8.722 23.859 8.166-10.624-3.635 0 0zM410.565 208.154c-17.866-7.962-53.476-11.784-50.532-38.784 25.183 0.819 39.943 18.105 50.532 38.784zM357.701 201.523c14.254 4.457 59.323 22.090 44.053 45.072-5.074 7.642-62.756 79.504-60.539 80.42-19.041-8.197 31.396-67.141 37.666-75.174 10.43-13.366 13.422-24.412-5.747-32.653-29.837-12.825-40.678-18.055-55.726 8.474-22.303-29.289 21.123-32.154 40.294-26.137 19.481 6.093-16.154-5.069 0 0zM353.067 168.269c-1.331-0.077-2.663-0.128-3.993-0.154 1.203 0.026 2.537 0.077 3.993 0.154zM352.606 181.786c0 8.207-68.572 12.288-77.133 15.027 7.547-20.247 77.133-48.286 77.133-15.027zM311.519 152.935c-8.555 2.137-47.504 23.317-46.766 25.026-10.419-24.179 82.611-66.654 99.423-26-17.538-0.409-35.202-1.666-52.656 0.973-0.205 0.051 17.433-2.637 0 0zM254.866 292.736c-10.032-19.492 41.91-22.93 48.679-5.461 5.212 13.447-22.485 44.050-26.432 51.31-2.683-7.583 10.606-45.666 12.144-45.1-4.216-1.552-33.713 0.825-34.391-0.75-12.493-24.269 0.077 0.179 0 0zM209.144 340.429c2.288-0.64 27.136 31.488 36.454 32.691 9.173 1.216 26.503-1.928 14.49 11.546-28.081 29.486-61.315-41.341-50.944-44.237-2.662 0.743-14.131 3.942 0 0zM223.352 32.666c-0.307 1.639-0.563 3.277-0.743 4.941 0.154-1.639 0.41-3.277 0.743-4.941zM110.558 270.157c-12.948 5.414-25.403 1.49-27.52-14.080 14.776 22.228 6.951-24.87 15.975-33.075-0.054 9.137 0.481 18.921 3.026 27.733 5.993 20.746 16.261-11.079 21.678-14.188 2.519 12.493-1.802 26.721-13.159 33.61zM110.558 270.157c-12.948 5.414-25.403 1.49-27.52-14.080 14.776 22.228 6.951-24.87 15.975-33.075-0.054 9.137 0.481 18.921 3.026 27.733 5.993 20.746 16.261-11.079 21.678-14.188 2.519 12.493-1.802 26.721-13.159 33.61zM260.293 384.486c-31.688 26.473-59.776-41.651-51.149-44.058-0.351 0.098 26.893 27.699 30.334 29.904 6.326 4.050 36.342 0.837 20.815 14.154zM301.022 299.546c-8.3 12.867-16.576 25.554-23.911 39.040-5.414-15.301 22.966-44.831 5.854-46.162-6.838-0.533-30.137 5.209-29.442-5.207 1.346-20.255 65.142-13.793 47.498 12.329-0.051 0.077 19.61-29.031 0 0zM311.519 152.935c-8.555 2.137-47.504 23.317-46.766 25.026-10.419-24.179 82.611-66.654 99.423-26-17.538-0.409-35.202-1.666-52.656 0.973-0.205 0.051 17.433-2.637 0 0zM352.632 181.504c0 8.748-68.306 12.475-77.159 15.309 7.271-19.505 80.261-47.834 77.159-15.309 0 0.077 1.997-20.941 0 0zM349.074 168.115c1.203 0.026 2.534 0.077 3.993 0.154-1.331-0.077-2.663-0.128-3.993-0.154zM403.372 242.637c0 9.067-66.558 82.558-62.157 84.377-19.041-8.197 31.396-67.141 37.666-75.174 10.43-13.366 13.422-24.412-5.747-32.653-29.837-12.825-40.678-18.055-55.726 8.474-29.286-38.464 90.688-39.257 85.965 14.976 0 0.051 2.176-24.986 0 0zM410.594 208.154c-18.091-6.776-53.409-12.623-50.56-38.784 32.671 1.063 30.402 31.959 50.56 38.784zM413.255 321.664c-2.222 4.144-4.231 17.255-9.37 17.255-0.387-5.77 10.716-35.53 5.863-37.635-2.255-0.976-27.389-1.923-25.058-6.38 6.274-11.986 25.971-10.752 34.69-3.464 9.856 8.243-2.271 22.402-6.126 30.224-0.028 0.051 8.036-16.307 0 0zM222.61 37.606c0.154-1.639 0.41-3.274 0.743-4.941-0.307 1.639-0.563 3.277-0.743 4.941zM223.916 70.656c-0.043-0.069 0.12 0.118 0 0 0 0 0.025 0.026 0 0zM222.61 37.606c0.154-1.639 0.41-3.274 0.743-4.941-0.307 1.639-0.563 3.277-0.743 4.941zM287.122 5.197c-0.313-0.341 0.732 0.474 0 0-0.026-0.026 0.077 0.051 0 0zM334.2 11.187c-7.577 0-7.577-11.725 0-11.725 7.603 0 7.603 11.725 0 11.725zM340.063-16c-7.577 0-7.577-11.75 0-11.75 7.606 0 7.606 11.75 0 11.75zM353.375 30.131c0.292-0.072 0.873-0.141 0 0 0 0 0.156-0.026 0 0zM353.861 30.003c0.379-0.074 1.861-0.279 0 0 0.128-0.026 0.333-0.051 0 0zM414.331 77.261c0.067-0.059 0.305-0.305 0 0 0 0 0.048-0.051 0 0z" />
+<glyph unicode="&#xe618;" glyph-name="jenkins" d="M152.881 342.978c-8.282 4.939-16.329-0.065-17.567-9.079 1.951 2.942 4.653 4.162 8.111 3.661-3.341-6.495-3.823-19.462 2.135-24.873-0.010 2.688 0.548 31.632 9.207 19.582 2.192-3.050 3.203-8.928 6.636-10.897 1.627 8.085-1.141 17.186-8.521 21.606-3.497 2.085 5.894-3.53 0 0zM248.777 416.43c-18.444 15.587-41.647-25.912-32.594-28.438-1.696 0.473 17.41 20.19 23.383 20.969 2.749 0.364 19.689-1.333 9.21 7.47-7.847 6.632 1.74-1.461 0 0zM274.981 361.957c-5.863 8.48-10.228 15.688-15.203 24.856-3.209-9.039 4.17-20.297 8.716-27.532 2.216-3.62-22.928-1.765-22.984-1.872-8.049-15.615 42.512-14.231 29.472 4.548-1.363 1.97 1.642-2.364 0 0zM296.389 176.848c-4.854 0-4.861-7.519 0-7.519 4.882 0 4.877 7.519 0 7.519zM300.149 159.412c-4.86 0-4.865-7.536 0-7.536 4.88 0 4.877 7.536 0 7.536zM308.194 286.255c-0.437 3.955-41.538 7.096-49.468 9.637 4.042-10.844 17.377-15.048 27.585-16.966 11.898-2.238 23.284-6.308 21.883 7.329-0.084 0.755 0.296-2.873 0 0zM280.543 267.966c-10.584 1.796-19.23 6.636-24.034 16.483-5.093 1.755-6.541-1.637-2.405-5.511 8.941-8.378 15.302-18.869 28.282-21.484 9.949-2.005 28.666-1.355 33.226 9.677-11.68-0.281-23.474-1.127-35.070 0.835-10.161 1.724 11.545-1.954 0 0zM340.683 325.953c-0.498 3.983-44.124 51.645-39.796 53.44-13.238-5.694 28.168-51.708 29.693-55.819 3.615-9.744-8.421-12.737-14.648-15.61-6.47-2.983-14.139-6.035-21.458-5.27-7.995 0.836-5.952 7.858-8.854 12.98-15.83-20.78 15.474-20.019 25.846-16.767 12.663 3.971 31.183 10.524 29.217 27.046-0.279 2.233 0.296-2.479 0 0zM345.362 303.165c-14.254-6.746-34.277-7.66-32.409-24.873 8.084 0.26 15.702 3.181 21.622 8.767 2.317 2.179 11.894 16.596 10.786 16.106-7.32-3.464 0.296 0.132 0 0zM346.529 377.159c-0.719 1.545-3.129 9.867-5.45 9.867-0.521-7.829 2.492-14.643 5.257-21.772 1.656-4.27-13.793-3.544-16.259-4.216-6.115-1.619 7.476-10.166 14.285-7.831 15.854 5.433 7.313 12.819 2.167 23.952-1.363 2.923 2.526-5.467 0 0zM383.286 114.38c-8.986-0.783-18.507-3.776-23.985-11.476 8.729-0.565 20.267 11.216 23.985 11.476-9.061-0.789 0.231 0.015 0 0zM391.382 98.373c-6.423 2.050-21.747 5.505-26.582-1.873 5.805-0.537 24.848 2.363 26.582 1.873-4.32 1.377 0.296-0.084 0 0zM394.845 83.989c-7.112 2.719-24.065 7.544-30.504 0.577 7.777-0.671 25.17 1.801 30.504-0.577zM394.845 83.989c-7.112 2.719-24.065 7.544-30.504 0.577 7.777-0.671 25.17 1.801 30.504-0.577zM391.382 98.373c-6.423 2.050-21.747 5.505-26.582-1.873 5.805-0.537 24.848 2.363 26.582 1.873-4.32 1.377 0.296-0.084 0 0zM383.286 114.38c-8.986-0.783-18.507-3.776-23.985-11.476 8.729-0.565 20.267 11.216 23.985 11.476-9.061-0.789 0.231 0.015 0 0zM300.149 159.412c-4.86 0-4.865-7.536 0-7.536 4.88 0 4.877 7.536 0 7.536zM296.389 176.848c-4.854 0-4.861-7.519 0-7.519 4.882 0 4.877 7.519 0 7.519zM346.529 377.159c-0.719 1.545-3.129 9.867-5.45 9.867-0.521-7.829 2.492-14.643 5.257-21.772 1.656-4.27-13.793-3.544-16.259-4.216-6.115-1.619 7.476-10.166 14.285-7.831 15.854 5.433 7.313 12.819 2.167 23.952-1.363 2.923 2.526-5.467 0 0zM345.362 303.165c-14.254-6.746-34.277-7.66-32.409-24.873 8.084 0.26 15.702 3.181 21.622 8.767 2.317 2.179 11.894 16.596 10.786 16.106-7.32-3.464 0.296 0.132 0 0zM340.683 325.953c-0.498 3.983-44.124 51.645-39.796 53.44-13.238-5.694 28.168-51.708 29.693-55.819 3.615-9.744-8.421-12.737-14.648-15.61-6.47-2.983-14.139-6.035-21.458-5.27-7.995 0.836-5.952 7.858-8.854 12.98-15.83-20.78 15.474-20.019 25.846-16.767 12.663 3.971 31.183 10.524 29.217 27.046-0.279 2.233 0.296-2.479 0 0zM280.543 267.966c-10.584 1.796-19.23 6.636-24.034 16.483-5.093 1.755-6.541-1.637-2.405-5.511 8.941-8.378 15.302-18.869 28.282-21.484 9.949-2.005 28.666-1.355 33.226 9.677-11.68-0.281-23.474-1.127-35.070 0.835-10.161 1.724 11.545-1.954 0 0zM308.194 286.255c-0.437 3.955-41.538 7.096-49.468 9.637 4.042-10.844 17.377-15.048 27.585-16.966 11.898-2.238 23.284-6.308 21.883 7.329-0.084 0.755 0.296-2.873 0 0zM274.981 361.957c-5.863 8.48-10.228 15.688-15.203 24.856-3.209-9.039 4.17-20.297 8.716-27.532 2.216-3.62-22.928-1.765-22.984-1.872-8.049-15.615 42.512-14.231 29.472 4.548-1.363 1.97 1.642-2.364 0 0zM248.777 416.43c-18.444 15.587-41.647-25.912-32.594-28.438-1.696 0.473 17.41 20.19 23.383 20.969 2.749 0.364 19.689-1.333 9.21 7.47-7.847 6.632 1.74-1.461 0 0zM152.881 342.978c-8.282 4.939-16.329-0.065-17.567-9.079 1.951 2.942 4.653 4.162 8.111 3.661-3.341-6.495-3.823-19.462 2.135-24.873-0.010 2.688 0.548 31.632 9.207 19.582 2.192-3.050 3.203-8.928 6.636-10.897 1.627 8.085-1.141 17.186-8.521 21.606-3.497 2.085 5.894-3.53 0 0zM394.845 83.989c-7.112 2.719-24.065 7.544-30.504 0.577 7.777-0.671 25.17 1.801 30.504-0.577zM391.382 98.373c-6.423 2.050-21.747 5.505-26.582-1.873 5.805-0.537 24.848 2.363 26.582 1.873-4.32 1.377 0.296-0.084 0 0zM383.286 114.38c-8.986-0.783-18.507-3.776-23.985-11.476 8.729-0.565 20.267 11.216 23.985 11.476-9.061-0.789 0.231 0.015 0 0zM346.529 377.159c-0.719 1.545-3.129 9.867-5.45 9.867-0.521-7.829 2.492-14.643 5.257-21.772 1.656-4.27-13.793-3.544-16.259-4.216-6.115-1.619 7.476-10.166 14.285-7.831 15.854 5.433 7.313 12.819 2.167 23.952-1.363 2.923 2.526-5.467 0 0zM345.362 303.165c-14.254-6.746-34.277-7.66-32.409-24.873 8.084 0.26 15.702 3.181 21.622 8.767 2.317 2.179 11.894 16.596 10.786 16.106-7.32-3.464 0.296 0.132 0 0zM340.683 325.953c-0.498 3.983-44.124 51.645-39.796 53.44-13.238-5.694 28.168-51.708 29.693-55.819 3.615-9.744-8.421-12.737-14.648-15.61-6.47-2.983-14.139-6.035-21.458-5.27-7.995 0.836-5.952 7.858-8.854 12.98-15.83-20.78 15.474-20.019 25.846-16.767 12.663 3.971 31.183 10.524 29.217 27.046-0.279 2.233 0.296-2.479 0 0zM280.543 267.966c-10.584 1.796-19.23 6.636-24.034 16.483-5.093 1.755-6.541-1.637-2.405-5.511 8.941-8.378 15.302-18.869 28.282-21.484 9.949-2.005 28.666-1.355 33.226 9.677-11.68-0.281-23.474-1.127-35.070 0.835-10.161 1.724 11.545-1.954 0 0zM308.194 286.255c-0.437 3.955-41.538 7.096-49.468 9.637 4.042-10.844 17.377-15.048 27.585-16.966 11.898-2.238 23.284-6.308 21.883 7.329-0.084 0.755 0.296-2.873 0 0zM300.149 159.412c-4.86 0-4.865-7.536 0-7.536 4.88 0 4.877 7.536 0 7.536zM296.389 176.848c-4.854 0-4.861-7.519 0-7.519 4.882 0 4.877 7.519 0 7.519zM274.981 361.957c-5.863 8.48-10.228 15.688-15.203 24.856-3.209-9.039 4.17-20.297 8.716-27.532 2.216-3.62-22.928-1.765-22.984-1.872-8.049-15.615 42.512-14.231 29.472 4.548-1.363 1.97 1.642-2.364 0 0zM248.777 416.43c-18.444 15.587-41.647-25.912-32.594-28.438-1.696 0.473 17.41 20.19 23.383 20.969 2.749 0.364 19.689-1.333 9.21 7.47-7.847 6.632 1.74-1.461 0 0zM152.881 342.978c-8.282 4.939-16.329-0.065-17.567-9.079 1.951 2.942 4.653 4.162 8.111 3.661-3.341-6.495-3.823-19.462 2.135-24.873-0.010 2.688 0.548 31.632 9.207 19.582 2.192-3.050 3.203-8.928 6.636-10.897 1.627 8.085-1.141 17.186-8.521 21.606-3.497 2.085 5.894-3.53 0 0zM296.389 176.848c-4.854 0-4.861-7.519 0-7.519 4.882 0 4.877 7.519 0 7.519zM300.149 159.412c-4.86 0-4.865-7.536 0-7.536 4.88 0 4.877 7.536 0 7.536zM152.881 342.978c-8.282 4.939-16.329-0.065-17.567-9.079 1.951 2.942 4.653 4.162 8.111 3.661-3.341-6.495-3.823-19.462 2.135-24.873-0.010 2.688 0.548 31.632 9.207 19.582 2.192-3.050 3.203-8.928 6.636-10.897 1.627 8.085-1.141 17.186-8.521 21.606-3.497 2.085 5.894-3.53 0 0zM248.777 416.43c-18.444 15.587-41.647-25.912-32.594-28.438-1.696 0.473 17.41 20.19 23.383 20.969 2.749 0.364 19.689-1.333 9.21 7.47-7.847 6.632 1.74-1.461 0 0zM274.981 361.957c-5.863 8.48-10.228 15.688-15.203 24.856-3.209-9.039 4.17-20.297 8.716-27.532 2.216-3.62-22.928-1.765-22.984-1.872-8.049-15.615 42.512-14.231 29.472 4.548-1.363 1.97 1.642-2.364 0 0zM308.194 286.255c-0.437 3.955-41.538 7.096-49.468 9.637 4.042-10.844 17.377-15.048 27.585-16.966 11.898-2.238 23.284-6.308 21.883 7.329-0.084 0.755 0.296-2.873 0 0zM280.543 267.966c-10.584 1.796-19.23 6.636-24.034 16.483-5.093 1.755-6.541-1.637-2.405-5.511 8.941-8.378 15.302-18.869 28.282-21.484 9.949-2.005 28.666-1.355 33.226 9.677-11.68-0.281-23.474-1.127-35.070 0.835-10.161 1.724 11.545-1.954 0 0zM340.683 325.953c-0.498 3.983-44.124 51.645-39.796 53.44-13.238-5.694 28.168-51.708 29.693-55.819 3.615-9.744-8.421-12.737-14.648-15.61-6.47-2.983-14.139-6.035-21.458-5.27-7.995 0.836-5.952 7.858-8.854 12.98-15.83-20.78 15.474-20.019 25.846-16.767 12.663 3.971 31.183 10.524 29.217 27.046-0.279 2.233 0.296-2.479 0 0zM345.362 303.165c-14.254-6.746-34.277-7.66-32.409-24.873 8.084 0.26 15.702 3.181 21.622 8.767 2.317 2.179 11.894 16.596 10.786 16.106-7.32-3.464 0.296 0.132 0 0zM346.529 377.159c-0.719 1.545-3.129 9.867-5.45 9.867-0.521-7.829 2.492-14.643 5.257-21.772 1.656-4.27-13.793-3.544-16.259-4.216-6.115-1.619 7.476-10.166 14.285-7.831 15.854 5.433 7.313 12.819 2.167 23.952-1.363 2.923 2.526-5.467 0 0zM383.286 114.38c-8.986-0.783-18.507-3.776-23.985-11.476 8.729-0.565 20.267 11.216 23.985 11.476-9.061-0.789 0.231 0.015 0 0zM391.382 98.373c-6.423 2.050-21.747 5.505-26.582-1.873 5.805-0.537 24.848 2.363 26.582 1.873-4.32 1.377 0.296-0.084 0 0zM394.845 83.989c-7.112 2.719-24.065 7.544-30.504 0.577 7.777-0.671 25.17 1.801 30.504-0.577zM152.881 342.978c-8.282 4.939-16.329-0.065-17.567-9.079 1.951 2.942 4.653 4.162 8.111 3.661-3.341-6.495-3.823-19.462 2.135-24.873-0.010 2.688 0.548 31.632 9.207 19.582 2.192-3.050 3.203-8.928 6.636-10.897 1.627 8.085-1.141 17.186-8.521 21.606-3.497 2.085 5.894-3.53 0 0zM394.845 83.989c-7.112 2.719-24.065 7.544-30.504 0.577 7.777-0.671 25.17 1.801 30.504-0.577zM394.845 83.989c-7.112 2.719-24.065 7.544-30.504 0.577 7.777-0.671 25.17 1.801 30.504-0.577zM394.845 83.989c-7.112 2.719-24.065 7.544-30.504 0.577 7.777-0.671 25.17 1.801 30.504-0.577zM391.382 98.373c-6.423 2.050-21.747 5.505-26.582-1.873 5.805-0.537 24.848 2.363 26.582 1.873-4.32 1.377 0.296-0.084 0 0zM345.362 303.165c-14.254-6.746-34.277-7.66-32.409-24.873 8.084 0.26 15.702 3.181 21.622 8.767 2.317 2.179 11.894 16.596 10.786 16.106-7.32-3.464 0.296 0.132 0 0zM308.194 286.255c-0.437 3.955-41.538 7.096-49.468 9.637 4.042-10.844 17.377-15.048 27.585-16.966 11.898-2.238 23.284-6.308 21.883 7.329-0.084 0.755 0.296-2.873 0 0zM305.927 277.488c0.774 0.017 1.625 0.050 2.563 0.099-0.857-0.049-1.709-0.082-2.563-0.099zM280.543 267.966c-10.584 1.796-19.23 6.636-24.034 16.483-5.093 1.755-6.541-1.637-2.405-5.511 8.941-8.378 15.302-18.869 28.282-21.484 9.949-2.005 28.666-1.355 33.226 9.677-11.68-0.281-23.474-1.127-35.070 0.835-10.161 1.724 11.545-1.954 0 0zM346.529 377.159c-0.719 1.545-3.129 9.867-5.45 9.867-0.521-7.829 2.492-14.643 5.257-21.772 1.656-4.27-13.793-3.544-16.259-4.216-6.115-1.619 7.476-10.166 14.285-7.831 15.854 5.433 7.313 12.819 2.167 23.952-1.363 2.923 2.526-5.467 0 0zM274.981 361.957c-5.863 8.48-10.228 15.688-15.203 24.856-3.209-9.039 4.17-20.297 8.716-27.532 2.216-3.62-22.928-1.765-22.984-1.872-8.049-15.615 42.512-14.231 29.472 4.548-1.363 1.97 1.642-2.364 0 0zM248.777 416.43c-18.444 15.587-41.647-25.912-32.594-28.438-1.696 0.473 17.41 20.19 23.383 20.969 2.749 0.364 19.689-1.333 9.21 7.47-7.847 6.632 1.74-1.461 0 0zM383.286 114.38c-8.986-0.783-18.507-3.776-23.985-11.476 8.729-0.565 20.267 11.216 23.985 11.476-9.061-0.789 0.231 0.015 0 0zM340.683 325.953c-0.498 3.983-44.124 51.645-39.796 53.44-13.238-5.694 28.168-51.708 29.693-55.819 3.615-9.744-8.421-12.737-14.648-15.61-6.47-2.983-14.139-6.035-21.458-5.27-7.995 0.836-5.952 7.858-8.854 12.98-15.83-20.78 15.474-20.019 25.846-16.767 12.663 3.971 31.183 10.524 29.217 27.046-0.279 2.233 0.296-2.479 0 0zM296.389 176.848c-4.854 0-4.861-7.519 0-7.519 4.882 0 4.877 7.519 0 7.519zM300.149 159.412c-4.86 0-4.865-7.536 0-7.536 4.88 0 4.877 7.536 0 7.536zM409.391 125.214c-11.573 26.015-41.22 9.692-58.495 1.050 6.051 15.906 11.138 32.151 16.218 48.386 3.827 12.236 14.067 30.897 10.74 44.016-6.522 25.73-47.807 23.486-28.782 54.257 21.325 34.493 22.587 94.96 11.116 133.431-17.522 58.767-78.629 83.808-135.267 70.017-25.858-6.291-53.017-18.222-72.123-37.186-7.754-7.694-9.65-17.688-17.847-24.571-8.033-6.742-11.215-16.635-11.44-26.867-0.212-9.621 1.278-19.321 0.632-28.922-0.668-9.936-7.927-18.028-7.281-29.623 0.701-12.609 4.978-25.827 13.805-35.132 4.569-4.799 10.429-8.375 16.845-10.081 5.884-1.573 4.903-10.399 6.623-15.109 4.3-11.77 15.798-20.128-0.262-28.060-13.629-6.73-26.92-14.653-39.424-23.292-6.846-4.728-18.831-7.36-21.070-16.658-2.912-12.087 6.353-30.458 10.194-41.608 8.172-23.727 16.282-46.774 16.772-72.085 0.172-8.901-0.192-17.957 0.622-26.833 1.195-13.062 22.456-17.002 32.079-21.76 13.329-6.591 27.344-12.243 42.54-10.993 4.141 0.149 6.922-18.091 7.627-20.991 2.148-8.823 5.053-28.284 13.914-33.079 13.916-7.531 36.442-5.897 51.678-5.447 12.67 0.375 31.428-1.701 41.885 7.071 4.88 4.093 3.341 8.777 2.899 14.216-0.488 6.004 9.961 6.119 13.805 8.507 12.027 7.471 3.498 24.971 1.767 35.487-1.308 7.887 6.007 22.572 14.658 24.802 21.356 5.508 51.293-20.629 69.419 5.575 11.975 17.314 4.057 44.151-3.846 61.478zM202.939 458.64c5.429 0 6.357-2.635-0.794-6.143-10.731-5.265-21.434-9.662-30.294-18.006-6.723-6.33-12.329-12.94-22.039-14.334 9.371 20.481 32.606 32.295 53.127 38.483 0.017 0-20.144-6.075 0 0zM143.031 411.259c8.82 6.596 22.275 4.835 32.556 4.925-0.381-7.907-7.598-6.605-13.216-6.518-9.171 0.128-16.601-4.414-22.361-11.262-10.369-12.338 4.96-29.020-7.109-37.219-5.989 18.257-6.391 37.69 10.13 50.074 7.881 5.894-9.44-7.076 0 0zM164.965 292.461c4.383 4.297 4.715 13.914-3.644 7.453-6.848-5.294-15.030-5.022-21.651 0.432-11.012 9.067-18.090 28.089-10.601 41.205 9.983 17.48 30.405 15.628 35.62-3.957 1.804-6.776 13.689-8.685 16.897-0.893 2.684 6.516-1.441 15.877-3.029 22.2-2.091 8.337-0.468 16.168 1.343 24.482 2.822 12.952 0.679 23.837 1.355 36.456 0.934 17.457 29.906 34.69 43.434 41.139 20.434 9.742 42.364 9.382 63.688 2.582 24.555-7.829 35.401-23.757 52.752-41.105-8.661 2.567-22.663-0.803-20.422-12.494 8.754 8.548 22.83 1.993 29.491-5.823 9.313-10.929 7.875-28.283 8.418-41.624 1.146-32.939-3.935-67.336-22.147-95.469-15.175-23.481-42.024-43.028-71.649-37.875-27.81 3.613-47.725 28.38-62.090 50.304 0.76-21.322 23.261-41.199 41.028-49.861-10.905 2.52-15.072-2.327-24.698-4.286-9.161-1.867-23.102 2.733-30.709 7.585-12.171 7.764-36.712 46.451-23.382 59.548 5.762 5.648-6.617-6.501 0 0zM225.644 214.854c4.096 18.668 39.885-8.309 49.515-9.046-0.224-5.974-9.859-5.26-13.561-7.010 31.649-1.312-3.531-24.947-14.633-29.642-22.066-9.334-25.571 30.928-21.321 45.699 0.328 1.494-2.167-7.536 0 0zM225.299 190.622c-0.214 1.067-0.377 2.118-0.476 3.168 0.115-1.067 0.279-2.118 0.476-3.168zM289.741 214.083c-5.178-3.844-19.389 2.495-24.2 6.272 1.481 0.945 10.192-1.94 13.484-1.519 8.089 1.039 15.748 4.735 23.866 5.375-4.488-3.239-8.872-6.615-13.151-10.128zM280.822 197.517c0 4.728 2.297 16.087 9.723 8.734 8.015-6.887-6.191-21.348-9.723-8.734 0 0.017 3.747-13.38 0 0zM266.756 173.384c9.192 6.332 29.222-38.276 29.222-47.644-16.764 5.045-32.716 12.483-48.022 20.914-11.443 6.301 14.49 23.743 18.8 26.73 0.262 0.18-9.36-6.485 0 0zM276.408 180.969c7.452 7.848 25.87 8.601 32.257-1.291 5.654-8.754-1.521-41.897-5.070-51.591-9.501 17.388-14.341 37.396-27.188 52.882 4.613 4.86 12.791-15.416 0 0zM307.275 189.308c-13.428 2.753-8.647 12.853 3.183 14.25-8.527 4.167-18.122 0.371-9.261 10.113 6.267 3.81 19.621 16.802 26.797 8.536 5.226-6.019 6.317-16.154 6.14-23.766-0.379-16.538-14.088-11.957-26.86-9.133-1.284 0.262 7.355-1.625 0 0zM217.288 209.371c-4.19 0.264-30.38 7.926-23.789 14.661 7.24-7.24 25.909 1.534 23.789-14.661-3.661 0.231 0.148 1.133 0 0zM123.888 185.467c8.725-37.81 22.297-85.837 12.494-124.544-8.957 4.566-5.869 18.613-6.534 27.106-1.123 14.581-2.936 29.118-5.61 43.498-2.303 12.382-23.827 63.113-14.21 69.389 13.822 9.022 26.868 18.629 41.303 26.72 16.759 9.394 17.433 7.452 29.511-6.559-14.17-6.337-28.345-12.663-42.517-18.993-11.706-5.229-17.362-3.618-14.438-16.616 2.019-8.75-0.329 1.461 0 0zM191.874 111.67c0.017-2.265-1.745-5.209-1.691-7.913-1.935 0.803-21.073-1.642-23.54 1.42-2.328 2.891 9.064 5.835 9.729 6.735 2.567 3.467-3.939 8.414-2.689 12.368 4.638-2.259 8.363-6.188 13.429-7.618 0 6.533-1.715 46.906 5.216 48.214 6.935 1.31-9.206-52.18 7.754-50.053-2.88-0.573-5.94-0.99-8.209-3.152zM295.288-18.49c-20.716-4.152-42.71-3.413-63.347 0.921-13.851 2.909-13.816 6.040-17.7 19.504-3.082 10.68-5.794 21.459-8.153 32.322-5.029 23.149-8.466 46.603-11.030 70.143 19.376 0 39.278 6.159 58.923 6.812 6.612 0.224 39.611 3.569 42.691-5.252 5.928-16.988 2.934-42.413 3.897-60.308 0.639-11.863 1.236-23.733 2.050-35.586 0.964-14.014 8.416-25.311-7.332-28.555zM303.875 93.38c-0.308 13.514-0.668 16.434 14.497 16.434 3.239-11.801-0.111-19.192-14.497-16.434-0.082 3.644 2.233-0.427 0 0zM324.134 6.844c-17.952-7.497-15.981 1.99-16.772 16.388-0.535 9.765-2.565 20.7 7.762 22.152 6.864 0.966 9.23-33.594 9.010-38.541zM323.215 149.693c-4.906-8.228-9.34-17.087-16.171-23.937 3.195 9.406 1.634 75.945 26.221 51.371 4.684-4.228-4.111-17.688-10.050-27.434zM348.135 66.143c-8.383-3.178-12.328-5.526-13.062 4.459-1.002 13.591-4.226 26.973-5.572 40.542 20.899 1.483 18.336-29.75 18.634-45.001zM348.465 218.697c-8.413 6.286-15.447 18.26-27.072 14.546 3.405 4.96 9.491 6.899 12.855 11.903 5.101-4.88 10.148-9.816 15.31-14.631 7.746-7.226 19.959-13.45 17.788-25.838-6.288 4.679-12.591 9.341-18.88 14.021-4.351 3.25 6.289-4.679 0 0zM404.497 66.538c-8.030-8.015-23.779-10.611-33.983-5.697 7.029 3.93 15.377 3.116 22.806 5.762-6.406 2.764-35.239-2.344-37.673 1.566-3.771 6.055-2.305 20.243-3.279 27.278-1.678 12.126-6.611 17.226 6.664 22.587 13.248 5.352 34.24 18.478 43.142 0.555 6.664-13.421 13.204-39.524 2.323-52.052-7.599-7.585 8.457 9.736 0 0z" />
+<glyph unicode="&#xe619;" glyph-name="jenkins-o" d="M425.644 126.235c-2.456 5.259-6.217 6.365-9.9 10.048 8.971 9.868 13.968 28.457 17.714 41.011 4.953 16.601 7.626 33.867 7.986 51.185 0.69 33.016-7.082 66.029-22.73 95.13-7.211 13.409-16.035 25.945-26.231 37.251-2.737 3.038-8.269 6.828-10.036 10.407-0.546 9.565-1.719 19.116-3.805 28.471-5.984 26.818-23.050 49.578-45.837 64.925-25.482 17.164-62.091 18.777-91.157 11.706-24.291-5.91-54.101-19.307-72.118-37.183-4.245-4.213-7.702-9.167-9.976-14.715-1.504-3.671-1.048-5.442-4.52-7.488-2.366-1.392-4.481-3.18-6.28-5.25-3.889-4.476-6.24-10.087-7.695-15.779-0.834-3.262-1.384-6.594-1.742-9.938-0.713-6.667-1.008-7.457-6.016-12.002-23.5-21.323-41.38-48.685-51.686-78.681-20.476-59.601-10.091-127.439 27.773-177.864 4.218-5.615 8.748-10.997 13.563-16.109 4.756-5.048 13.237-9.993 13.7-16.948 0.534-7.997 0.309-16.089 1.037-24.058 0.72-7.899 5.416-10.189 12.295-12.717 13.648-5.019 25.833-13.298 39.858-17.455 7.281-2.156 14.876-3.204 22.466-2.584 3.227 0.111 7.151-19.712 8.28-23.498 2.274-7.634 4.643-15.25 7.376-22.737 3.106-8.512 7.278-8.867 15.935-10.537 16.378-3.157 33.352-3.287 49.957-2.405 9.137 0.486 20.613 0.002 29.010 3.998 5.088 2.224 8.915 5.894 8.195 11.614-0.832 6.63-2.349 8.997 4.002 10.386 10.765 2.627 16.699 7.103 15.009 19.113-0.94 6.697-3.094 13.151-4.192 19.817-1.075 6.543-2.003 11.384 4.057 14.129 2.187 1.033 3.837 2.548 4.264 5.125 0.83 5.005 6.291 5.668 11.333 6.507 4.675 0.78 9.408 0.873 14.135 0.697 4.651-8.986 16.822-8.107 25.841-7.719 40.779 1.752 32.255 48.288 20.128 74.145-2.346 5.024 3.841-8.192 0 0zM382.777 354.932c34.564-33.74 50.282-87.344 47.161-134.548-1.651-24.98-8.491-49.563-20.116-71.741-4.162-7.94-6.242-11.885-15.502-11.885-9.3-2.257-18.163-6.224-26.695-10.491 9.097 23.899 15.974 48.44 23.955 72.704 2.808 8.537 6.324 18.087-0.128 25.756-5.482 6.516-12.711 11.944-19.225 17.428-3.818 3.214-12.226 8.466-13.303 13.763-1.385 6.846 8.762 18.342 11.089 24.751 8.563 23.594 12.396 49.238 12.764 74.263 0.033-0.033-0.312-21.146 0 0zM246.97 175.291c0 4.565-3.906 10.952-4.769 15.586-1.429 7.666-1.99 16.438 0.173 23.979 0.335 1.502 1.095 3.478 2.216 4.597 2.704 4.449 10.754 1.264 13.837 0.361 10.962-3.209 22.308-13.147 33.464-14.002-0.216-5.69-9.048-4.884-13.563-7.012 9.137-0.382 19.995-3.714 11.182-12.526-2.038 0-7.281-6.076-8.897-7.396-3.555-2.902-7.447-5.403-11.576-7.38-4.755-1.995-11.675-5.69-17.026-4.925-3.069 0.002-4.329 6.728-5.040 8.719 0 0.017 0.739-2.068 0 0zM242.029 190.625c-0.214 1.065-0.377 2.118-0.476 3.168 0.115-1.067 0.279-2.118 0.476-3.168zM297.536 197.57c0 4.766-2.446 8.532 3.661 10.097 2.368 0 4.096 0.545 6.075-1.412 7.93-6.812-6.005-22.147-9.736-8.685 0 0.065 0.082-0.296 0 0zM305.926 213.692c0-4.296-22.069 5.423-23.658 6.666 0.354 0.233 0.66 0.517 0.92 0.856 7.841-7.128 27.281 2.276 36.43 3.005-4.839-3.147-9.033-7.14-13.692-10.526 0-0.017 4.679 3.399 0 0zM287.177 175.882c6.226-6.226 10.448-15.94 14.157-23.786 3.139-6.637 11.373-19.066 11.373-26.353-16.74 5.037-32.733 12.495-48.017 20.923-11.786 6.498 16.935 25.495 22.487 29.217 0.017-0.017-10.852-7.273 0 0zM293.137 180.971c4.618 4.853 7.311 3.558 13.659 6.173 5.166 2.582 9.543-3.075 13.817-5.060 5.876-2.731 5.219-0.89 4.914-8.419-0.279-5.978-0.443-11.957-0.821-17.928-0.577-9.082-1.212-18.998-4.384-27.647-9.465 17.336-14.389 37.47-27.186 52.881 1.297 1.363 12.214-14.71 0 0zM324.002 189.311c-1.272 0.26-2.919 0.92-4.252 0.92-3.798 0.78-3.287 0.123-3.456 4.618-0.017 0.406-0.846 6.728 0.682 6.728 2.116 2.017 7.841 1.699 10.214 1.986-3.502 1.702-7.948 2.346-11.772 1.363 0.659 0-2.021 6.115-2.070 6.255 1.346 0.489 3.584 1.399 4.58 2.497 2.724 1.649 5.207 3.757 7.995 5.301 3.659 2.558 9.373 6.262 14.037 5.762 10.747 0 14.37-33.909 7.191-37.892-7.536-0.002-15.796 0.83-23.149 2.461zM343.966 234.476c-2.135 0.317-3.894-0.602-5.846-1.232 3.349 4.868 9.517 6.95 12.855 11.903 6.771-6.464 13.533-13.136 20.505-19.389 7.485-6.718 14.582-9.757 12.592-21.080-6.291 4.674-12.582 9.348-18.873 14.022-4.367 3.246-16.212 15.311-21.233 15.775-0.329 0.049 3.202-0.296 0 0zM221.638 459.2c2.208 0.649 4.226-1.822 2.052-3.75-2.311-2.049-7.201-4.078-9.969-5.253-7.34-3.115-14.365-7.035-20.697-11.893-9.756-7.481-13.441-16.281-26.483-18.145 9.332 20.394 34.581 33.23 55.097 39.041 1.117 0.329-20.457-5.796 0 0zM145.673 384.287c0.364 12.425 4.639 19.891 14.087 26.974 7.874 5.897 23.106 4.839 32.556 4.925-0.399-8.165-6.882-6.62-13.223-6.523-9.457 0.143-16.26-4.012-22.354-11.257-4.418-5.259-4.382-14.198-3.497-20.637 0.491-4.043 1.484-8.007 1.988-12.045 0.478-3.816-2.988-2.763-5.601-4.536-2.402 7.301-4.206 15.364-3.955 23.1 0.017 0.575-0.017-0.493 0 0zM142.653 331.602c0.688 13.154 16.913 29.086 30.42 20.028 6.122-4.105 8.178-12.552 9.556-19.339 4.696-0.2 9.53-0.015 13.807 2.135 6.93 4.181-2.65 24.687-2.397 31.933 0.292 8.676 2.774 16.986 4.351 25.464 0 5.288 1.536 10.359 1.33 15.777-0.47 7.383-3.894 11.629 0.322 18.337 11.912 18.954 37.759 37.005 60.062 41.472 19.604 3.921 41.090-1.218 59.033-9.206 18.117-8.064 25.341-22.369 38.718-35.746-8.754 2.589-22.711-0.57-20.423-12.494 9.831 9.598 27.264 0.132 32.377-10.113 5.533-11.131 5.043-25.168 5.533-37.334 1.151-32.965-3.887-67.269-22.142-95.47-7.813-12.072-15.124-21.44-27.915-28.351-13.111-6.974-28.739-12.132-43.738-9.522-27.308 3.544-48.013 28.836-62.090 50.303 0.702-19.779 24.496-41.796 41.028-49.861-3.272 0.754-6.595 1.149-9.951 1.149-3.76 0-8.124-0.659-10.879-3.47-4.124-4.21-13.029-1.32-18.838-0.305-22.799 4.095-31.397 20.466-38.399 41.119-2.595 7.656-7.347 17.856-0.722 24.349 5.757 5.644 4.447 13.719-3.649 7.46-18.949-14.644-36.313 14.373-35.393 31.684 0.427 8.176-0.476-8.964 0 0zM234.46 212.805c0.139-1.135-0.297-2.297-0.444-3.432-3.666 0.224-30.516 7.784-23.789 14.661 2.044-2.043 26.358-2.503 24.233-11.229zM133.361 106.615c-69.537 71.2-66.793 190.534 6.353 258.135 0-4.815 1.755-3.579 0.804-8.274-0.509-2.44-2.865-3.844-3.776-6.042-1.996-4.741-2.96-9.878-3.191-15.002-0.645-14.257 3.839-30.808 13.853-41.356 4.572-4.817 10.412-8.386 16.843-10.092 5.405-1.434 3.47-3.179 4.635-8.274 1.031-4.512 2.59-9.284 5.029-13.243 2.44-3.96 7.825-10.033 5.335-15.084-1.993-4.060-9.578-6.822-13.288-8.875-11.793-6.531-23.689-13.311-34.782-20.98-8.174-5.649-23.094-8.946-21.228-21.499 4.605-31.36 25.070-58.217 25.070-91.070-0.552 0.551-1.103 1.105-1.656 1.658-15.745 16.122 0.542-0.558 0 0zM155.294 87.702c0.185-8.908 0.024-18.094-2.184-26.777-5.994 3.053-5.242 3.942-5.549 10.748-0.246 5.455-0.565 10.911-0.985 16.357-0.923 11.93-2.306 23.837-4.24 35.644-3.862 23.591-9.923 46.998-19.636 68.892-2.611 5.885 4.408 8.115 9.035 11.587 5.070 3.769 10.198 7.465 15.442 10.99 4.717 3.172 32.724 20.103 37.029 20.103 3.971 0 11.003-11.42 13.364-14.168-9.512-4.249-19.024-8.498-28.537-12.748-6.99-3.121-13.98-6.245-20.969-9.366-1.629-0.728-8.78-2.634-9.631-4.301-0.716-1.402 1.852-7.735 2.187-9.194 2.010-8.748 3.869-17.529 5.582-26.339 4.572-23.502 8.546-47.447 9.092-71.428zM190.789 104.596c-0.568-0.039-1.137-0.079-1.708-0.099 0.452 0 2.368 0.421 1.708 0.099-0.23-0.017 0.033 0.017 0 0zM208.57 111.639c-1.701-2.096-1.708-5.347-1.658-7.88-6.304 2.611-13.637 0.656-20.161 0.656-7.795-0.138-0.977 5.149 3.005 5.959 8.922 1.452-0.865 9.079 0.656 13.906 4.577-2.231 8.482-6.226 13.429-7.618 0 4.5 2.309 9.409 2.251 14.272-0.074 6.161-0.911 12.269-1.412 18.399-0.337 4.132-0.573 8.543 0.821 12.531 0.416 1.192 4.679 5.036 4.679 1.717 3.37-8.826-0.622-23.198-0.675-32.62-0.023-4.082-0.274-8.211 0.48-12.248 1.087-5.129 1.988-4.507 6.829-3.891-2.417-0.485-6.478-1.103-8.245-3.185-0.985-1.215 0.279 0.329 0 0zM311.262-18.635c-11.839-2.312-24.056-2.995-36.084-2.256-6.733 0.416-13.409 0.955-20.064 2.108-6.465 1.085-12.865 2.561-19.143 4.449-2.638 8.091-5.073 16.247-7.292 24.464-6.482 23.985-11.031 48.424-14.326 73.037-0.946 7.066-1.791 14.142-2.565 21.23 5.661 0 12.011 2.116 17.639 2.94 13.678 2.002 27.465 3.411 41.284 3.873 7.792 0.264 15.72 0.368 23.502-0.299 3.433-0.294 6.868-0.627 10.292-1.008 7.356-0.822 8.91-0.729 9.729-8.346 0-9.74 1.149-19.649 1.664-29.377 0.934-17.688 1.842-35.379 2.888-53.060 0.358-6.043 0.719-12.084 1.289-18.111 0.532-5.642 1.049-11.346 2.205-16.904-3.58-1.113-7.337-2.017-11.018-2.74-0.673-0.132 2.003 0.394 0 0zM320.603 93.383c-0.086 3.647-1.959 14.37 1.808 15.367 1.97 0.578 4.115 0.796 6.15 0.923 2.141 0.132 4.411 0.144 6.539 0.144 1.074-3.885 1.844-7.849 2.415-11.837 0-3.149-14.687-5.017-16.912-4.597zM340.865 6.846c-3.868-1.287-7.755-2.99-11.887-3.202-6.242-0.832-4.171 7.68-4.477 12.694-0.421 6.897-0.847 13.804-0.916 20.716-0.103 10.417 3.495 2.502 8.56 7.567 1.373-0.279-3.411 1.813 3.103 0.084 0.425-3.712 1.159-7.378 1.944-11.027 1.901-8.832 4.087-17.721 3.673-26.832-0.642-0.214 0.606 13.348 0 0zM339.288 148.596c-4.529-7.452-9.302-16.623-15.514-22.836 3.61 10.632 4.937 22.105 5.999 33.226 0.78 8.14-3.288 23.036 8.038 23.036 4.4 0.2 9.064-1.774 12.182-4.892-0.505 0.462-1.031 0.899-1.576 1.315 5.431-4.702 5.139-5.45 1.543-11.673-3.515-6.082-7.007-12.183-10.671-18.176-2.645-4.351 2.428 3.973 0 0zM364.865 66.146c-3.966-0.815-7.457-3.070-11.606-3.070-1.32 0.745-1.43 8.931-1.786 11.458-1.714 12.205-4.024 24.348-5.24 36.615 4.628 0.322 9.816 2.087 12.072-2.712 2.437-5.192 3.84-10.847 4.807-16.48-0.003-8.273 1.878-17.144 1.753-25.81-0.476-0.099 0.050 3.447 0 0zM421.227 66.54c-7.593-7.593-24.171-10.423-33.983-5.697 6.961 3.887 15.43 3.132 22.804 5.762-9.817 4.226-21.765 1.343-32.031 0.993-5.092-0.173-5.889-1.286-6.388 3.99-0.491 5.204-0.952 10.412-1.534 15.606-0.918 8.232-1.962 16.575-4.361 24.524 5.373 5.705 14.24 7.769 21.377 10.147 10.081 3.426 18.878 11.801 28.25 1.916 5.719-6.035 7.017-16.147 8.867-24.014 2.658-11.31 5.457-23.497-3.003-33.229-0.017-0.017 4.909 5.647 0 0zM178.591 326.415c0.033-1.297-0.049-2.594-0.246-3.891-0.049-0.361-0.131-0.739-0.214-1.149-0.115 0.065-0.214 0.131-0.328 0.214-0.017 0.017-0.033 0.017-0.033 0.033-0.115 0.082-0.214 0.181-0.312 0.279-3.563 3.382-5.582 15.63-11.69 12.248-2.873-1.593-3.218-6.075-3.431-8.947-0.312-4.17-0.065-8.34-0.049-12.51-3.037 2.758-3.924 7.601-4.22 11.476-0.345 4.449 0.017 9.375 2.085 13.397-3.792 1.855-5.434-1.904-8.111-3.661 0.542 3.94 2.184 7.831 5.746 9.9 3.694 2.118 8.323 1.264 11.821-0.821 5.894-3.53 8.882-9.965 8.981-16.565zM412.033 83.795c-10.31-0.214-20.686-0.115-30.964 0.772 2.988 3.236 8.851 3.267 12.872 3.053 3.284-0.132 6.585-0.591 9.803-1.281 2.545-0.558 5.352-1.131 7.716-2.297 0 0 0.033 0 0.082-0.034l0.033-0.017c0.146-0.065 0.31-0.132 0.458-0.197zM412.033 83.795c-10.31-0.214-20.686-0.115-30.964 0.772 2.988 3.236 8.851 3.267 12.872 3.053 3.284-0.132 6.585-0.591 9.803-1.281 2.545-0.558 5.352-1.131 7.716-2.297 0 0 0.033 0 0.082-0.034l0.033-0.017c0.146-0.065 0.31-0.132 0.458-0.197zM412.033 83.795c-10.31-0.214-20.686-0.115-30.964 0.772 2.988 3.236 8.851 3.267 12.872 3.053 3.284-0.132 6.585-0.591 9.803-1.281 2.545-0.558 5.352-1.131 7.716-2.297 0 0 0.033 0 0.082-0.034l0.033-0.017c0.146-0.065 0.31-0.132 0.458-0.197zM409.046 98.1c-4.579 1.566-9.534 2.375-14.364 2.51-4.267 0.12-10.522-0.097-13.152-4.103 9.144-0.851 18.438 0.627 27.516 1.592-4.991 1.707-7.567-0.805 0 0zM362.091 303.168c-7.322-3.464-14.121-8.012-21.836-10.622-2.167-0.739-4.384-1.33-6.632-1.74-1.1-0.197-2.218-0.361-3.349-0.476-0.887-0.099-0.774-0.853-0.856-1.675-0.214-2.019-0.148-4.055-0.048-6.074 0.048-0.985 0.113-1.954 0.195-2.939 0.034-0.459 0.065-0.903 0.115-1.346 0.526 0.017 1.050 0.033 1.576 0.065 7.553 0.476 14.531 3.497 20.046 8.702 4.712 4.433 8.192 9.966 11.197 15.646 0.164 0.296 0.329 0.575 0.476 0.87-0.292-0.132-0.589-0.279-0.885-0.411zM324.923 286.257c-0.084 0.755-0.18 1.511-0.329 2.249-0.148 0.772 0.033 1.067-0.821 1.051-1.412-0.033-2.84-0.066-4.27-0.082-5.449-0.066-10.901 0.033-16.352 0.394-5.073 0.361-10.146 0.886-15.137 1.904-2.101 0.427-4.17 0.936-6.223 1.576-2.2 0.656-4.187 1.855-6.337 2.544 3.005-8.061 11.527-12.445 19.243-14.891 8.191-2.577 16.91-3.596 25.513-3.546 0.458 0 0.92 0 1.363 0.017 0.345 0 0.706 0 1.082 0.016 0.856 0.017 1.707 0.050 2.563 0.099-0.017 2.889-0.002 5.795-0.296 8.668zM325.216 277.589c-0.936-0.050-1.789-0.082-2.563-0.099 0.856 0.017 1.709 0.049 2.563 0.099zM297.274 267.968c-10.161 1.724-19.931 6.337-24.002 16.401-0.017 0.033-0.017 0.049-0.033 0.082v0.016c-0.509 0.887-2.856 0.772-3.661 0.624-1.772-0.328-1.608-1.806-1.116-3.152 0.986-2.266 3.628-3.825 5.139-5.73 3.070-3.908 6.191-7.667 10.064-10.836 2.957-2.43 6.223-4.515 9.738-6.075 3.825-1.708 7.519-2.413 11.706-2.397 6.812 0.033 14.316 0.837 20.736 3.185 3.103 1.133 5.286 4.104 6.502 7.043-11.656-0.279-23.528-1.117-35.070 0.838zM363.257 377.161c-1.363 2.923-2.676 5.877-4.072 8.8-0.411 0.87-0.392 1.067-1.379 1.067-0.048-0.723-0.065-1.428-0.065-2.151 0-1.363 0.082-2.725 0.262-4.071 0.591-4.794 2.397-9.211 4.204-13.643 0.296-0.69 1.658-3.202 1-3.579-0.706-0.394-1.461-0.656-2.231-0.87-1.757-0.476-3.596-0.624-5.401-0.739-2.052-0.132-4.139-0.197-6.175-0.444-0.887-0.115-1.755-0.262-2.594-0.493-0.868-0.23-1.576-0.246-1.541-1.215 0.065-2.249 0.786-4.515 2.577-5.993 3.579-2.955 9.225-2.003 13.248-0.624 2.923 1.002 6.388 2.627 8.719 5.057 0.868 0.887 1.576 1.888 2.052 2.988-3.416 4.974-6.076 10.442-8.604 15.909zM292.546 353.767c0.997 2.796 0.895 5.719-0.83 8.194-1.368 1.962-3.368 3.314-4.974 5.051-5.137 5.551-6.7 13.301-10.233 19.805-2.437-6.85 1.949-15.37 5.089-21.279 1.131-2.131 2.353-4.213 3.625-6.264 0.682-1.096-2.85-2.373-3.755-2.607-3.714-0.962-7.721-0.12-11.406 0.572-1.991 0.374-3.985 0.773-6 0.978-1.072 0.109-1.31 0.166-1.814-0.804-0.279-0.537-0.514-1.099-0.676-1.683-0.56-2.014 0.033-3.95 1.582-5.339 3.774-3.382 10.159-3.748 14.95-3.621 2.471 0.065 5.183 0.241 7.526 1.101 2.354 0.863 6.040 3.411 6.916 5.895 2.479 6.945-0.575-1.625 0 0zM267.822 410.298c0.606 2.382-0.515 4.61-2.32 6.135-7.842 6.632-18.839 0.757-25.222-5.043-3.592-3.264-6.977-7.309-8.642-11.928-1.085-2.93-2.941-8.289 0.015-10.748 0.556-0.463 2.103-1.438 2.103-0.036 0.5 1.077 1.024 2.144 1.579 3.195 1.11 2.098 2.343 4.137 3.748 6.053 2.059 2.806 4.476 5.367 7.371 7.32 2.946 1.988 6.316 3.262 9.841 3.72 2.093 0.272 4.216 0.269 6.316 0.051 1.080-0.112 2.156-0.279 3.221-0.494 0.752-0.151 1.010-0.506 1.412 0.274 0.248 0.474 0.443 0.98 0.578 1.5 0.675 2.643-0.164-0.641 0 0zM400.969 114.468c-9.36-0.682-19.24-3.569-24.937-11.558 4.848-0.317 9.257 1.918 13.285 4.353 2.084 1.261 4.119 2.596 6.232 3.807 1.819 1.043 4.208 1.66 5.42 3.399-3.152-0.23-0.262-0.377 0 0zM357.411 325.955c-0.279 2.233-2.397 3.612-3.99 4.991-1.986 1.724-3.76 3.612-5.514 5.565-5.861 6.55-11.541 13.315-16.649 20.473-3.957 5.532-8.471 11.689-9.998 18.404-0.377 1.674-1.231 5.007-3.644 4.006-1.183-0.509-0.903-1.428-0.87-2.577 0.033-1.034 0.115-2.052 0.23-3.070 0.231-2.019 0.608-4.006 1.149-5.959 2.2-8.159 6.733-15.482 11.738-22.197 4.679-6.272 9.933-11.985 14.955-17.945 2.118-2.529 3.563-5.401 2.873-8.767-0.23-1.133-0.64-2.233-1.166-3.284-0.524-1.083-0.786-1.56-1.887-2.003-1.529-0.641-3.039-1.346-4.531-2.052-7.388-3.546-14.891-7.552-23.134-8.62-3.382-0.443-8.388-0.837-10.868 2.052-2.545 2.971-1.887 7.404-3.758 10.704-3.612-4.744-3.399-11.755-0.215-16.647 0.377-0.591 0.788-1.133 1.266-1.642 0.69-0.755 1.018-0.87 2.052-0.952 1.921-0.148 3.858-0.214 5.796-0.197 3.397 0.033 6.797 0.361 10.13 0.969 11.64 2.151 21.836 7.946 31.686 14.218 0.214 0.148 0.427 0.279 0.655 0.427 0.247 0.148 0.51 0.312 0.757 0.476-0.346 2.118 0.885 4.465 1.576 6.387 0.837 2.298 1.658 4.761 1.363 7.24zM313.118 176.855c-2.068 0-3.76-1.692-3.76-3.762 0-2.085 1.691-3.758 3.76-3.758 2.085 0 3.776 1.675 3.776 3.758 0 2.068-1.691 3.762-3.776 3.762zM316.878 159.418c-2.068 0-3.76-1.69-3.76-3.776 0-2.068 1.691-3.76 3.76-3.76 2.085 0 3.776 1.691 3.776 3.76 0 2.087-1.691 3.776-3.776 3.776z" />
+<glyph unicode="&#xe61a;" glyph-name="brick" d="M512 352v-288h-512v288h64v46.129c0 9.872 8.049 17.871 17.982 17.871h108.073c9.896 0 17.945-7.999 17.945-17.871v-46.129h96v46.129c0 9.872 8.038 17.871 17.981 17.871h110.019c9.933 0 17.982-7.999 17.982-17.871v-46.129h62.018z" />
+<glyph unicode="&#xe61b;" glyph-name="build-hand" horiz-adv-x="473" d="M185.238 80.442c0-1.123-0.436-2.204-1.239-3.007l-13.679-13.68-87.105 87.105 13.68 13.68c0.597 0.597 2.731 1.262 3.007 1.262 0.964 0 1.859-0.322 2.617-0.895 0.138-0.117 81.482-81.435 81.482-81.435 0.804-0.827 1.239-1.882 1.239-3.029zM182.3 41.54c0-1.147-0.459-2.204-1.262-3.009l-69.271-69.291c-0.803-0.783-1.859-1.24-3.007-1.24s-2.204 0.457-3.007 1.24l-104.549 104.572c-1.607 1.606-1.607 4.407 0 6.014l69.271 69.271c0.803 0.805 1.859 1.24 3.007 1.24 0.23 0 2.364-0.597 3.007-1.24l104.549-104.549c0.804-0.803 1.262-1.885 1.262-3.007zM473.82 233.377v-3.101c0-9.181-6.45-16.593-14.412-16.593l-170.033-39.662c0 0-36.334-28.739-48.249-37.438-10.26-7.459-15.47-14.802-29.081-14.802-0.827 0-8.905 0.62-10.168 0.824l-24.261-24.284-68.72 68.72 46.823 46.823 34.268 42.437c0 0 3.512 5.488 5.049 6.337 0.941 0.525 2.020 0.824 3.191 0.824h133.354c1.767 0 3.42-0.689 4.659-1.951 1.24-1.24 1.928-2.892 1.928-4.66v-12.968c0-1.744-0.688-3.394-1.928-4.657-1.24-1.239-2.894-1.928-4.659-1.928 0 0-83.754 0.092-84.993 0.092-2.617 0-4.728-2.114-4.728-4.751 0-2.594 1.469-4.567 5.807-4.567l-0.025-0.069h83.938c4.246 0 8.24 1.655 11.247 4.638 2.984 3.007 4.657 7 4.657 11.244v6.083h111.919c7.967 0 14.416-7.436 14.416-16.593zM472.742 444.493v-157.868h-322.851v157.868h38.308v24.171c0 6.264 5.072 11.337 11.339 11.337h81.275c6.243 0 11.315-5.072 11.315-11.337v-24.169h44.712v24.169c0 6.264 5.072 11.337 11.339 11.337h81.272c6.266 0 11.339-5.072 11.339-11.337v-24.169h31.952z" />
+<glyph unicode="&#xe61c;" glyph-name="tag" d="M463.906 480h-144.281c-26.453 0-63.398-15.303-82.102-34.007l-223.495-223.495c-18.704-18.704-18.704-49.312 0-68.016l172.455-172.453c18.704-18.705 49.311-18.705 68.015 0l223.495 223.494c18.704 18.705 34.007 55.651 34.007 82.102v144.281c0 26.452-21.643 48.094-48.094 48.094zM400 320c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48z" />
+<glyph unicode="&#xe61d;" glyph-name="compass" d="M252.723 476.135c-135.731-1.817-244.275-113.305-242.458-249.011 1.817-135.731 113.305-244.275 249.037-242.483 135.706 1.843 244.275 113.305 242.457 249.037-1.869 135.731-113.357 244.275-249.037 242.457zM258.586 36.403c-107.136-1.459-195.149 84.25-196.608 191.411-1.408 107.136 84.275 195.149 191.437 196.583 107.136 1.433 195.149-84.249 196.583-191.411s-84.25-195.123-191.411-196.583zM139.597 115.097c0 0 116.966 16.051 166.861 65.945s65.945 166.861 65.945 166.861-116.941-16.077-166.835-65.946c-49.894-49.92-65.971-166.861-65.971-166.861zM230.784 256.717c20.966 20.992 61.056 35.865 95.462 45.107-9.241-34.329-24.192-74.727-45.031-95.539-13.926-13.926-36.505-13.926-50.432 0-13.952 13.926-13.952 36.506 0 50.432z" />
+<glyph unicode="&#xe61e;" glyph-name="flow-cascade" d="M358.4 112.64c-25.267 0-47.002-15.309-56.423-37.12h-84.377c-36.147 0-39.526 30.515-39.68 39.68v99.021c11.034-5.094 24.141-8.141 39.68-8.141h84.377c9.421-21.837 31.155-37.12 56.423-37.12 33.92 0 61.44 27.52 61.44 61.44s-27.52 61.44-61.44 61.44c-25.267 0-47.002-15.309-56.423-37.12h-84.377c-36.147 0-39.526 30.515-39.68 39.68v58.778c21.837 9.421 37.094 31.155 37.094 56.423 0 33.92-27.494 61.44-61.415 61.44s-61.44-27.52-61.44-61.44c0-25.267 15.309-46.976 37.12-56.423v-237.978c0-35.507 23.526-88.32 88.32-88.32h84.378c9.421-21.837 31.155-37.12 56.423-37.12 33.92 0 61.44 27.495 61.44 61.44 0 33.92-27.52 61.44-61.44 61.44zM358.4 265.856c19.584 0 35.456-15.872 35.456-35.456s-15.872-35.456-35.456-35.456-35.456 15.872-35.456 35.456 15.872 35.456 35.456 35.456zM118.144 409.6c0 19.584 15.872 35.456 35.456 35.456s35.456-15.872 35.456-35.456-15.872-35.456-35.456-35.456-35.456 15.872-35.456 35.456zM358.4 15.744c-19.584 0-35.456 15.872-35.456 35.456s15.872 35.456 35.456 35.456 35.456-15.872 35.456-35.456-15.872-35.456-35.456-35.456z" />
+<glyph unicode="&#xe61f;" glyph-name="puzzle-piece" horiz-adv-x="476" d="M475.428 161.714q0-23.143-12.714-38.572t-35.286-15.428q-11.714 0-22.143 5t-16.857 10.857-16.143 10.857-20.286 5q-31.428 0-31.428-35.428 0-11.143 4.572-32.857t4.286-32.857v-1.428q-6.286 0-9.428-0.286-9.714-0.857-27.857-3.286t-33-3.857-28-1.428q-17.428 0-29.428 7.572t-12 23.857q0 10.572 5 20.286t10.857 16.143 10.857 16.857 5 22.143q0 22.572-15.428 35.286t-38.572 12.714q-24 0-40.857-13t-16.857-36.428q0-12.286 4.285-23.714t9.572-18.428 9.571-15.143 4.286-14.428q0-12.857-13.143-25.428-10.572-10-33.428-10-27.143 0-70 6.857-2.572 0.572-7.857 1.143t-7.857 1.143l-3.715 0.572q-0.285 0-0.857 0.286-0.572 0-0.572 0.286v292.572q0.572-0.286 5-1t9.714-1.429 6.143-1q42.857-6.857 70-6.857 22.857 0 33.428 10 13.143 12.572 13.143 25.428 0 6.286-4.286 14.428t-9.572 15.143-9.572 18.428-4.285 23.714q0 23.429 16.857 36.429t41.143 13q22.857 0 38.286-12.715t15.428-35.285q0-11.715-5-22.143t-10.857-16.857-10.857-16.143-5-20.286q0-16.285 12-23.857t29.428-7.572q18.286 0 51.428 4.286t46.572 4.857v-0.571q-0.286-0.572-1-5t-1.428-9.714-1-6.143q-6.857-42.857-6.857-70 0-22.857 10-33.428 12.572-13.143 25.428-13.143 6.286 0 14.428 4.286t15.143 9.572 18.428 9.572 23.714 4.286q23.428 0 36.428-16.857t13-40.857z" />
+<glyph unicode="&#xe620;" glyph-name="menu" d="M-0.375 416h480.023v-64h-480.023v64zM0.375 96h255.125v-64h-255.125v64zM-0.023 256h480.023v-64h-480.023v64zM510.209 128l-110.513-161.32-110.515 161.32z" />
+<glyph unicode="&#xe621;" glyph-name="brick-menu" horiz-adv-x="476" d="M473.731 151.611l-126.3-184.365-126.304 184.365h252.605zM475.215 352v-160h-267.215c-16 0-16-12.685-16-16v-112h-191.785v288h59.375v46.13c0 9.87 7.465 17.87 16.68 17.87h100.265c9.18 0 16.65-8 16.65-17.87v-46.13h89.060v46.13c0 9.87 7.46 17.87 16.68 17.87h102.070c9.215 0 16.685-8 16.685-17.87v-46.13h57.535z" />
+<glyph unicode="&#xe622;" glyph-name="folder-menu" horiz-adv-x="476" d="M456.572 351.428c-12.572 12.572-27.623 18.857-45.143 18.857h-192v9.143c0 17.52-6.286 32.572-18.857 45.143s-27.623 18.857-45.143 18.857h-91.428c-17.52 0-32.572-6.285-45.143-18.857s-18.857-27.623-18.857-45.143v-274.285c0-17.52 6.285-32.572 18.857-45.143s27.623-18.857 45.143-18.857h118.857v36.572h-118.857c-7.623 0-14.091 2.663-19.428 8s-8 11.805-8 19.428v274.286c0 7.623 2.663 14.091 8 19.428s11.806 8 19.428 8h91.429c7.623 0 14.091-2.663 19.428-8s8-11.805 8-19.428v-18.286c0-7.623 2.663-14.091 8-19.428s11.805-8 19.428-8h201.143c7.623 0 14.091-2.663 19.428-8s8-11.805 8-19.428v-118.857h36.572v118.857c0 17.52-6.286 32.572-18.857 45.143zM473.731 151.611l-126.3-184.365-126.304 184.365z" />
+<glyph unicode="&#xe623;" glyph-name="checkbox-checked" d="M0 480v-512h512v512h-512zM480 0h-448v448h448v-448zM384 368l-160-160-96 96-64-64 160-160 224 224-64 64z" />
+<glyph unicode="&#xe624;" glyph-name="gear" horiz-adv-x="448" d="M223.969 305c-44.703 0-80.969-36.265-80.969-81 0-44.688 36.266-81.031 80.969-81.031 44.719 0 80.719 36.344 80.719 81.031-0 44.735-36 81-80.719 81zM386.313 177.469l-14.594-35.156 29.469-57.875-36.094-36.094-59.218 27.969-35.156-14.438-17.844-54.625-2.281-7.25h-51.016l-22.078 61.656-35.156 14.5-57.952-29.344-36.078 36.063 27.938 59.25-14.484 35.125-61.767 20.156v50.984l61.703 22.109 14.485 35.094-25.953 51.234-3.422 6.719 36.031 36.031 59.297-27.922 35.109 14.516 17.828 54.594 2.297 7.234h51l22.094-61.735 35.063-14.515 58.031 29.406 36.063-36.031-27.938-59.203 14.438-35.173 61.875-20.125v-50.969l-61.688-22.187z" />
+<glyph unicode="&#xe625;" glyph-name="cog" d="M292.572 219.429q0 30.286-21.428 51.714t-51.714 21.428-51.714-21.428-21.428-51.714 21.428-51.714 51.714-21.428 51.714 21.428 21.428 51.714zM438.857 250.572v-63.428q0-3.428-2.286-6.572t-5.714-3.714l-52.857-8q-5.428-15.428-11.143-26 10-14.286 30.572-39.428 2.857-3.428 2.857-7.143t-2.572-6.572q-7.714-10.572-28.286-30.857t-26.857-20.286q-3.428 0-7.428 2.572l-39.428 30.857q-12.572-6.572-26-10.857-4.572-38.857-8.286-53.143-2-8-10.286-8h-63.428q-4 0-7 2.428t-3.286 6.143l-8 52.572q-14 4.572-25.714 10.572l-40.285-30.572q-2.857-2.572-7.143-2.572-4 0-7.143 3.143-36 32.572-47.143 48-2 2.857-2 6.572 0 3.428 2.285 6.572 4.285 6 14.572 19t15.428 20.143q-7.715 14.286-11.715 28.286l-52.285 7.714q-3.715 0.572-6 3.572t-2.285 6.714v63.428q0 3.428 2.285 6.572t5.428 3.714l53.143 8q4 13.143 11.143 26.286-11.428 16.286-30.572 39.428-2.857 3.428-2.857 6.857 0 2.857 2.572 6.572 7.428 10.286 28.143 30.714t27 20.428q3.715 0 7.428-2.857l39.428-30.572q12.572 6.572 26 10.857 4.572 38.857 8.286 53.143 2 8 10.286 8h63.428q4 0 7-2.428t3.286-6.143l8-52.571q14-4.572 25.714-10.572l40.572 30.572q2.572 2.571 6.857 2.571 3.714 0 7.143-2.857 36.857-34 47.143-48.572 2-2.286 2-6.286 0-3.428-2.286-6.571-4.286-6-14.572-19t-15.428-20.143q7.428-14.286 11.714-28l52.286-8q3.714-0.571 6-3.571t2.286-6.714z" />
+<glyph unicode="&#xe626;" glyph-name="gear-menu" d="M259.67 152.365l126.305-184.365 126.3 184.365h-252.605zM378.24 242.045c0.25-3.51 0.38-7.050 0.38-10.625 0-13.635-1.895-26.775-5.105-39.42h-79.225c6.16 11.795 9.645 25.215 9.645 39.44 0 45.61-35.795 82.87-80.82 85.22-0.335 0.015-3.035 0.095-4.055 0.095-47.125 0-85.335-38.23-85.335-85.355 0-45.61 35.795-82.87 80.82-85.219 0.155-0.005 3.45 0.11 7.2 0.28l40.025-58.425v-80.615h-85.38v69.93c-26.56 7.34-50.385 21.225-69.48 40.020l-0.27-0.156-60.21-34.764-0.125 0.215-42.565 73.705 60.565 34.985c-2.47 9.515-4.175 19.34-4.885 29.44-0.25 3.51-0.38 7.050-0.38 10.625 0 13.865 1.96 27.22 5.265 40.065l-60.565 34.965 42.69 73.94 60.5-34.92c18.975 18.65 42.6 32.505 68.96 39.875 0.165 0.050 0.335 0.1 0.505 0.145v69.93h84.875v-69.93c26.56-7.34 50.385-21.225 69.48-40.020l0.27 0.155c0.065-0.055 0.125-0.12 0.19-0.18l60.145 34.73 42.565-73.705-60.565-34.985c2.47-9.515 4.175-19.34 4.885-29.44z" />
+<glyph unicode="&#xe627;" glyph-name="gear-menu-o" d="M259.17 152.365l126.305-184.365 126.3 184.365h-252.605zM274.030-12.5h-85.38c-6.904 0-12.5 5.596-12.5 12.5v60.693c-21.643 7.298-41.661 18.825-58.725 33.817l-52.485-30.305c-5.968-3.445-13.599-1.411-17.060 4.548l-0.125 0.216-42.58 73.731c-3.452 5.978-1.405 13.623 4.572 17.075l52.552 30.356c-1.535 7.506-2.571 14.997-3.089 22.368-0.272 3.821-0.41 7.695-0.41 11.502 0 11.061 1.179 22.413 3.511 33.861l-52.561 30.344c-2.871 1.657-4.966 4.387-5.824 7.59s-0.409 6.615 1.249 9.486l42.69 73.94c3.451 5.978 11.095 8.027 17.074 4.576l52.511-30.308c17.087 15 37.105 26.532 58.706 33.816v60.696c0 6.904 5.596 12.5 12.5 12.5h84.875c6.904 0 12.5-5.596 12.5-12.5v-60.692c21.726-7.326 41.817-18.916 58.923-33.991l52.411 30.264c5.978 3.452 13.623 1.404 17.075-4.573l42.565-73.705c3.452-5.978 1.406-13.623-4.572-17.075l-52.552-30.356c1.535-7.506 2.571-14.996 3.089-22.368 0.272-3.822 0.411-7.696 0.411-11.501 0-9.415-0.85-19.054-2.526-28.651-1.045-5.983-6.24-10.349-12.313-10.349h-76.55c-4.005 0-7.768 1.92-10.119 5.162s-3.007 7.415-1.762 11.222c2.38 7.278 3.586 14.894 3.586 22.636 0 38.745-30.262 70.679-68.904 72.734-0.501 0.019-2.781 0.082-3.471 0.082-40.161 0-72.835-32.683-72.835-72.855 0-35.805 26.656-66.774 62.005-72.036 3.438-0.512 6.507-2.432 8.471-5.299l55.38-80.835c1.425-2.080 2.188-4.543 2.188-7.065v-58.745c0-6.904-5.596-12.5-12.5-12.5zM201.15 12.5h60.38v42.374l-50.237 73.327c-20.808 4.339-39.755 15.43-53.827 31.615-15.464 17.786-23.981 40.573-23.981 64.164 0 53.957 43.888 97.855 97.835 97.855 1.237 0 4.123-0.086 4.611-0.107 0.032-0.002 0.064-0.003 0.096-0.005 51.963-2.712 92.668-45.628 92.668-97.703 0-4.714-0.334-9.397-0.999-14.020h49.962c0.48 4.709 0.721 9.39 0.721 14 0 3.216-0.117 6.492-0.348 9.737-0.627 8.915-2.146 18.058-4.515 27.188-1.412 5.44 0.98 11.154 5.846 13.964l49.742 28.734-30.063 52.058-49.321-28.48c-2.224-1.285-4.719-1.822-7.159-1.642-3.047 0.11-6.032 1.332-8.32 3.584-17.726 17.447-39.871 30.2-64.041 36.88-5.418 1.497-9.171 6.427-9.171 12.048v57.43h-59.875v-57.43c0-5.667-3.811-10.624-9.287-12.080l-0.093-0.028c-0.086-0.026-0.173-0.052-0.259-0.076-23.929-6.69-45.909-19.398-63.564-36.752-4.005-3.937-10.146-4.719-15.011-1.911l-49.675 28.672-30.191-52.291 49.74-28.715c4.859-2.805 7.254-8.506 5.856-13.94-3.278-12.738-4.87-24.825-4.87-36.95 0-3.217 0.117-6.493 0.348-9.737 0.626-8.914 2.146-18.057 4.516-27.188 1.412-5.44-0.98-11.154-5.847-13.964l-49.742-28.733 30.188-52.274 49.675 28.681c4.865 2.798 11 2.010 15-1.928 17.726-17.447 39.871-30.2 64.041-36.88 5.418-1.497 9.171-6.427 9.171-12.048v-57.43z" />
+<glyph unicode="&#xe628;" glyph-name="console" d="M0 448v-448h512v448h-512zM480 32h-448v384h448v-384zM448 384h-384v-320h384v320zM224 224h-32v-32h-32v-32h-32v32h32v32h32v32h-32v32h-32v32h32v-32h32v-32h32v-32zM352 160h-96v32h96v-32z" />
+<glyph unicode="&#xe629;" glyph-name="file-css" d="M192 174.277v57.113c0 7.564 3.348 14.718 9.427 20.143 6.080 5.424 14.096 8.413 22.573 8.413v28.555c-35.2 0-64-25.7-64-57.111v-42.833c0-7.886-7.164-14.279-16-14.279h-16v-28.555h16c8.837 0 16-6.395 16-14.279v-42.838c0-31.407 28.8-57.107 64-57.107v28.556c-8.477 0-16.494 2.988-22.573 8.413s-9.427 12.577-9.427 20.139v57.117c0 7.885-7.164 14.277-16 14.277 8.837-0.001 16 6.394 16 14.276zM320 145.723v-57.117c0-7.562-3.348-14.713-9.427-20.139s-14.095-8.413-22.573-8.413v-28.556c35.201 0 64 25.7 64 57.107v42.838c0 7.886 7.164 14.279 16 14.279h16v28.555h-16c-8.836 0-16 6.395-16 14.279v42.834c0 31.412-28.799 57.111-64 57.111v-28.555c8.479 0 16.494-2.989 22.573-8.415 6.080-5.424 9.427-12.578 9.427-20.142v-57.114c0-7.883 7.164-14.276 16-14.276-8.836 0.001-16-6.394-16-14.276zM451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304z" />
+<glyph unicode="&#xe62a;" glyph-name="service" horiz-adv-x="516" d="M175.222 72.202l-13.047-13.026-82.94 82.916 13.047 13.050c0.568 0.568 5.595 0.11 5.726 0l1.661-1.663 75.553-75.55c0.765-0.765 0.765-4.961 0-5.726zM173.583 38c0-1.093-0.415-2.098-1.18-2.863l-65.959-65.959c-0.765-0.767-1.792-1.18-2.863-1.18-1.093 0-2.098 0.413-2.863 1.18l-99.572 99.55c-1.53 1.53-1.53 4.218 0 5.748l65.959 65.936c0.765 0.765 1.792 1.202 2.885 1.202 0.197 0 0.415-0.022 0.634-0.065 0.831-0.131 1.618-0.522 2.207-1.137l0.35-0.328 99.222-99.222c0.765-0.765 1.18-1.771 1.18-2.863zM515.285 266.459v-13.316c0-4.664-3.779-8.453-8.456-8.453h-175.966v0.536c0 3.536-1.197 4.69-3.399 7.382-0.325 0.395-0.664 0.762-1.027 1.127-2.865 2.861-6.655 4.439-10.7 4.439h-126.978c-5.862 0-10.947-3.352-13.456-8.243-0.534-1.014-1.679-3.435-1.679-4.703v-0.536h-53.987c-4.679 0-8.456 3.79-8.456 8.453v13.317c0 4.681 3.778 8.455 8.456 8.455h387.191c4.679-0.002 8.456-3.776 8.456-8.458zM314.325 455.404c-97.22 0-176.571-76.481-181.183-172.563h362.365c-4.613 96.082-83.96 172.563-181.183 172.563zM334.425 461.978c-1.097 10.134-9.675 18.022-20.1 18.022-10.427 0-19.003-7.887-20.1-18.022 6.531 1.125 13.248 1.711 20.1 1.711s13.565-0.586 20.1-1.711zM451.186 220.688v-2.973c0-8.72-6.163-15.799-13.747-15.799l-161.88-37.767c0 0-34.596-27.341-45.961-35.623-9.748-7.103-14.709-14.118-27.69-14.118-0.765 0-8.48 0.592-9.66 0.787l-23.123-23.101-65.412 65.434 44.563 44.563 34.444 42.661c0.459 1.618 1.552 2.994 2.994 3.781 0.896 0.524 1.923 0.787 3.038 0.787h126.998c1.663 0 3.257-0.655 4.437-1.836s1.836-2.754 1.836-4.436v-12.348c0-1.683-0.656-3.256-1.836-4.436s-2.776-1.857-4.437-1.857c0 0-79.771 0.088-80.929 0.088-2.492 0-4.524-2.011-4.524-4.502 0-2.493 1.399-4.371 5.53-4.371l-0.022-0.065h79.945c4.046 0 7.824 1.593 10.69 4.437 2.863 2.863 4.437 6.666 4.437 10.709v5.769h106.565c7.606-0.002 13.747-7.061 13.747-15.779z" />
+<glyph unicode="&#xe62b;" glyph-name="service-o" horiz-adv-x="515" d="M94.246 155.42c-0.947 0-1.753-0.068-1.96-0.277l-13.047-13.050 82.94-82.916 13.048 13.026c0.765 0.765 0.765 4.961 0 5.726l-77.214 77.214c-0.085 0.070-2.131 0.277-3.766 0.277v0zM69.98 118.562l80.562-80.56-46.96-46.96-80.579 80.56 46.977 46.96zM69.99 141.614c-1.093 0-2.12-0.437-2.885-1.202l-65.959-65.936c-1.53-1.53-1.53-4.218 0-5.748l99.572-99.55c0.765-0.767 1.77-1.18 2.863-1.18 1.071 0 2.098 0.413 2.863 1.18l65.959 65.959c0.765 0.765 1.18 1.771 1.18 2.863s-0.415 2.098-1.18 2.865l-99.572 99.55c-0.59 0.612-1.377 1.005-2.207 1.137-0.219 0.041-0.437 0.063-0.634 0.063v0zM506.829 274.914h-387.19c-4.679 0-8.456-3.776-8.456-8.455v-13.316c0-4.664 3.778-8.453 8.456-8.453h53.987v0.536c0 1.268 1.143 3.689 1.679 4.703 2.509 4.891 7.597 8.244 13.456 8.244h126.982c4.046 0 7.835-1.58 10.7-4.439 0.363-0.365 0.7-0.732 1.027-1.127 2.201-2.691 3.399-3.846 3.399-7.382v-0.536h175.966c4.679 0 8.455 3.79 8.455 8.453v13.316c-0.005 4.684-3.781 8.458-8.46 8.458v0zM314.325 437.921c81.382 0 149.224-59.109 161.817-137.595h-323.636c12.593 78.486 80.435 137.595 161.819 137.595zM314.325 455.404c-97.22 0-176.571-76.481-181.183-172.563h362.365c-4.613 96.082-83.96 172.563-181.183 172.563v0zM314.325 480c-10.427 0-19.003-7.887-20.1-18.022 6.531 1.125 13.248 1.711 20.1 1.711s13.565-0.588 20.098-1.711c-1.095 10.134-9.673 18.022-20.098 18.022v0zM216.288 231.832c-2.198-3.421-3.475-7.488-3.475-11.846 0-10.272 7.070-20.664 20.62-21.759 0.78-0.107 1.571-0.161 2.371-0.161h79.945c8.654 0 16.824 3.379 23.053 9.557 3.285 3.285 5.783 7.149 7.4 11.356h87.442c-0.057-0.013-0.118-0.026-0.175-0.039l-161.88-37.767c-2.505-0.586-4.852-1.716-6.869-3.311-0.343-0.271-34.459-27.223-45.417-35.209-2.52-1.838-4.692-3.606-6.607-5.166-5.831-4.749-7.046-5.553-10.466-5.597-1.521 0.087-6.22 0.461-7.451 0.601-0.844 0.125-1.69 0.183-2.531 0.183-4.594 0-9.053-1.814-12.357-5.116l-10.757-10.746-40.697 40.709 32.201 32.199c0.44 0.44 0.852 0.901 1.242 1.384l32.883 40.729h21.523zM315.75 249.316h-127c-1.114 0-2.142-0.262-3.038-0.787-1.442-0.787-2.535-2.163-2.994-3.781l-1.814-2.251-7.278-9.005-25.352-31.405-44.563-44.563 65.412-65.434 23.123 23.101c1.18-0.197 8.895-0.787 9.66-0.787 12.982 0 17.943 7.015 27.69 14.118 11.364 8.283 45.961 35.623 45.961 35.623l161.88 37.767c7.584 0 13.747 7.079 13.747 15.799v2.973c0 8.718-6.144 15.777-13.747 15.777h-106.565v-5.769c0-4.043-1.575-7.846-4.437-10.709-2.865-2.844-6.644-4.437-10.69-4.437l-79.924 0.065c-4.131 0-5.53 1.877-5.53 4.371 0 2.491 2.032 4.502 4.524 4.502 1.159 0 80.929-0.088 80.929-0.088 1.663 0 3.257 0.678 4.437 1.857s1.836 2.754 1.836 4.436v12.348c0 1.683-0.656 3.256-1.836 4.436s-2.774 1.838-4.435 1.838v0z" />
+<glyph unicode="&#xe62c;" glyph-name="brick-menu-o" horiz-adv-x="476" d="M473.731 151.611l-126.3-184.365-126.304 184.365h252.605zM417.68 352v46.13c0 9.87-7.47 17.87-16.685 17.87h-102.070c-9.219 0-16.68-8-16.68-17.87v-46.13h-89.060v46.13c0 9.87-7.47 17.87-16.65 17.87h-100.265c-9.215 0-16.68-8-16.68-17.87v-46.13h-59.375v-288h191.785v112c0 3.315 0 16 16 16h267.215v160h-57.535zM443.215 224h-235.215c-28.26 0-48-19.74-48-48v-80h-127.785v224h59.375v64h69.595v-64h153.060v64h71.435v-64h57.535v-96z" />
+<glyph unicode="&#xe62d;" glyph-name="brick-o" d="M449.98 352v46.13c0 9.87-8.045 17.87-17.98 17.87h-110.020c-9.94 0-17.98-8-17.98-17.87v-46.13h-96v46.13c0 9.87-8.050 17.87-17.945 17.87h-108.075c-9.93 0-17.98-8-17.98-17.87v-46.13h-64v-288h512v288h-62.020zM480 96h-448v224h64v64h80v-64h160v64h81.98v-64h62.020v-224z" />
+<glyph unicode="&#xe62e;" glyph-name="quill" d="M192 186.667c0 0 101.972 61.18 159.383 37.013 11.901 18.134 23.624 37.668 35.101 57.611-56.163 13.76-130.484 1.376-130.484 1.376s95.106 57.061 153.333 39.2c11.675 21.054 23.027 41.821 33.978 61.152-46.388 3.134-91.311-4.352-91.311-4.352s59.574 35.744 113.289 41.799c16.899 27.43 32.585 48.94 46.711 59.534-280.5 0-448-320-512-512h32l96 160c0 0 32-32 128 0 22.737 7.579 45.474 28.626 67.786 56.967-56.308 14.277-131.786 1.7-131.786 1.7z" />
+<glyph unicode="&#xe62f;" glyph-name="feather-o" d="M97.738-25.6c-0.001 0-0.001 0-0.003 0-6.425 0.001-12.822 2.8-17.552 7.683-5.591 5.772-8.511 14.005-8.221 23.182 0.003 0.091 0.007 0.182 0.011 0.274 1.368 25.492 9.78 69.952 23.377 108.195-17.982 28.649-28.432 55.733-31.905 82.63-3.13 24.244-0.711 48.521 7.612 76.401 1.55 5.192 6.286 8.781 11.704 8.871s10.269-3.343 11.99-8.481c4.308-12.87 13.127-32.596 22.47-50.255 2.974-5.621 5.673-10.421 8.092-14.495-0.379 4.404-0.796 8.909-1.187 13.13-4.359 47.11-10.947 118.301 9.019 159.118 16.597 33.972 67.887 73.036 97.35 86.085 4.847 2.147 10.525 0.982 14.137-2.904 3.609-3.885 4.357-9.632 1.861-14.311-9.137-17.12-15.168-36.519-16.983-54.625-0.936-9.346-0.559-16.143 0.177-20.755 5.694 8.012 13.46 20.885 19.643 31.133 28.709 47.583 49.236 78.92 72.070 80.898 1.717 0.15 3.533 0.227 5.385 0.227 16.769 0 38.895-6.298 60.707-17.279 10.471-5.271 35.666-19.292 43.474-35.596 7.2-14.905 2.984-37.882 0.837-47.067-4.587-19.621-13.185-36.678-23.587-46.795-26.436-25.743-65.371-31.232-96.654-35.644-10.114-1.426-19.846-2.798-27.062-4.671 5.93-4.688 18.47-10.827 41.154-10.826 10.693 0.001 22.488 1.407 35.056 4.18 5.009 1.106 10.182-0.981 13.024-5.25 2.841-4.271 2.767-9.848-0.185-14.041-20.65-29.321-47.303-50.632-79.219-63.337-26.513-10.555-51.254-13.13-67.626-14.834-1.459-0.152-3.010-0.313-4.542-0.483 8.328-7.010 24.050-15.676 40.672-15.676 4.139 0 8.071 0.562 11.69 1.669 4.853 1.483 10.123-0.132 13.311-4.082 3.188-3.952 3.65-9.444 1.17-13.874-16.89-30.164-32.69-48.037-51.228-57.95-17.642-9.434-35.829-10.684-56.888-12.13-9.308-0.639-19.635-1.349-31.040-2.852-8.387-26.837-15.594-49.13-21.483-67.344-4.175-12.916-7.782-24.070-10.764-33.609-2.778-8.82-10.57-14.507-19.859-14.507zM87.296 227.028c-2.109-29.084 4.554-62.727 32.237-104.961 2.175-3.319 2.635-7.478 1.237-11.192-15.196-40.365-22.496-84.094-23.876-104.986 2.328 7.3 4.937 15.372 7.816 24.276 6.408 19.822 14.384 44.49 23.731 74.56 1.404 4.517 5.25 7.846 9.922 8.586 15.544 2.464 28.971 3.386 40.815 4.2 34.123 2.344 52.413 3.603 75.644 37.154-23.163 2.509-44.969 15.358-55.698 28.068-6.1 7.225-8.61 14.308-7.463 21.053 0.846 4.908 4.254 11.276 15.709 13.883 4.432 1.010 9.87 1.575 16.756 2.292 25.876 2.693 70.545 7.34 108.668 43.876-2.417-0.113-4.8-0.168-7.142-0.17-41.567-0.002-65.162 17.656-69.494 34.064-2.202 8.341 0.825 16.256 7.711 20.163 10.522 5.984 26.137 8.186 44.219 10.735 27.7 3.906 62.173 8.766 82.791 28.844 16.327 15.88 22.523 55.264 17.687 65.278-2.497 5.213-14.364 15.163-32.252 24.168-17.917 9.020-36.896 14.624-49.531 14.624-1.132 0-2.219-0.045-3.229-0.133-0.68-0.059-6.983-1.134-21.762-20.75-10.465-13.889-21.471-32.133-31.183-48.227-22.072-36.583-30.341-49.236-42.839-49.238-0.001 0-0.003 0-0.005 0-0.314 0-0.62 0.010-0.929 0.029-4.018 0.255-11.506 2.090-16.778 11.546-7.481 13.416-6.314 34.316-4.952 45.582 0.838 6.933 2.382 15.684 5.202 25.601-22.099-15.758-45.721-37.567-54.834-56.219-16.904-34.556-10.702-101.568-6.6-145.911 1.189-12.85 2.217-23.948 2.495-32.25 0.278-8.266 0.698-20.758-9.084-25.407-2.015-0.959-4.191-1.449-6.46-1.45-9.025-0.002-15.989 7.738-21.613 15.308-4.841 6.519-10.322 15.358-16.288 26.274-3.62 6.623-7.233 13.685-10.631 20.728z" />
+<glyph unicode="&#xe630;" glyph-name="arrow-shuffle" d="M85.334 277.333h74.666c15.702 0 29.718-8.341 39.488-21.355 6.934 12.885 15.552 24.81 25.408 35.456-17.131 17.558-39.808 28.565-64.896 28.565h-74.666c-11.797 0-21.334-9.558-21.334-21.333s9.536-21.334 21.334-21.334zM249.28 210.965c11.754 35.35 48.128 66.368 77.845 66.368h39.211l-27.584-27.584c-8.341-8.341-8.341-21.824 0-30.166 4.16-4.16 9.622-6.25 15.082-6.25s10.923 2.091 15.082 6.25l79.082 79.083-79.082 79.082c-8.341 8.341-21.824 8.341-30.166 0s-8.341-21.824 0-30.166l27.584-27.584h-39.211c-48.512 0-100.501-41.962-118.336-95.552l-10.070-30.102c-13.674-41.088-44.202-66.346-60.053-66.346h-53.334c-11.797 0-21.334-9.558-21.334-21.334s9.536-21.334 21.334-21.334h53.334c39.19 0 82.411 41.067 100.544 95.552l10.070 30.080zM338.752 185.749c-8.341-8.341-8.341-21.824 0-30.166l27.584-27.584h-49.877c-27.050 0-49.707 19.008-57.408 44.971-5.462-16-13.376-31.978-23.254-46.613 18.901-24.789 47.85-41.024 80.662-41.024h49.877l-27.584-27.584c-8.341-8.341-8.341-21.824 0-30.166 4.16-4.16 9.622-6.25 15.082-6.25s10.923 2.091 15.082 6.25l79.082 79.082-79.082 79.082c-8.341 8.341-21.824 8.341-30.166 0z" />
+<glyph unicode="&#xe631;" glyph-name="arrow-right" d="M283.584 313.749c-8.341-8.341-8.341-21.824 0-30.165l48.918-48.918h-161.834c-11.776 0-21.334-9.558-21.334-21.334s9.558-21.334 21.334-21.334h161.834l-48.918-48.918c-8.341-8.341-8.341-21.824 0-30.166 4.16-4.16 9.622-6.25 15.082-6.25s10.923 2.091 15.082 6.25l100.416 100.416-100.416 100.416c-8.341 8.341-21.824 8.341-30.166 0z" />
+<glyph unicode="&#xe632;" glyph-name="ant" d="M206.050 261.96c-0.69-4.090-1.040-8.47-1.040-13.14 0-1.7 0.050-3.44 0.14-5.2l-74.79 18.97c-2.89 0.74-5.22 2.85-6.24 5.64l-40.88 111.97-27.050 47.33c-2.47 4.32-0.97 9.82 3.34 12.28 4.32 2.47 9.82 0.97 12.28-3.34l27.43-48c0.25-0.45 0.47-0.91 0.64-1.38l39.51-108.22 66.66-16.91zM210.12 215.54c1.54-5.17 3.41-10.23 5.6-15.010l-88.5-28.49-39-135.55c-0.1-0.36-0.23-0.721-0.39-1.070l-26.79-59.48c-1.33-2.971-4.24-4.721-7.29-4.721-1.1 0-2.22 0.23-3.28 0.71-4.030 1.811-5.83 6.551-4.010 10.58l26.55 58.96 40.020 139.090c0.73 2.561 2.7 4.591 5.23 5.4l91.86 29.581zM205.37 240.44c0.48-5.8 1.44-11.82 2.85-17.8l-110.27-12.4-44.070-53.52c-0.43-0.52-0.91-0.979-1.43-1.39l-30.93-24c-1.64-1.28-3.59-1.89-5.51-1.89-2.69 0-5.35 1.189-7.12 3.479-3.050 3.93-2.33 9.58 1.59 12.63l30.14 23.38 45.75 55.57c1.49 1.81 3.62 2.96 5.94 3.22l113.060 12.721zM463.81 429.92l-27.050-47.33-40.88-111.97c-1.020-2.79-3.35-4.9-6.24-5.64l-85.8-21.76c0.010 0.28 0.030 0.54 0.040 0.82 0.080 1.62 0.12 3.21 0.12 4.78 0 4.52-0.32 8.77-0.98 12.75l77.58 19.69 39.52 108.22c0.17 0.47 0.38 0.93 0.64 1.37l27.431 48c2.46 4.32 7.96 5.82 12.279 3.35 4.31-2.46 5.81-7.96 3.34-12.28zM469.54-25.68c-1.070-0.48-2.19-0.71-3.29-0.71-3.050 0-5.96 1.75-7.29 4.72l-26.79 59.479c-0.16 0.351-0.29 0.71-0.39 1.070l-39 135.55-97.271 31.32c1.95 4.92 3.58 10.050 4.87 15.23l101.36-32.631c2.529-0.81 4.5-2.84 5.229-5.399l40.021-139.090 26.55-58.96c1.821-4.029 0.021-8.769-3.999-10.579zM511.11 135.31c-1.771-2.29-4.431-3.479-7.12-3.479-1.92 0-3.87 0.61-5.51 1.89l-30.931 24c-0.52 0.4-1 0.87-1.43 1.391l-44.070 53.52-120.479 13.548c1.189 5.77 1.949 11.52 2.27 17.030v0.010c0.010 0.28 0.030 0.54 0.040 0.82l123.799-13.93c2.33-0.26 4.46-1.41 5.95-3.22l45.75-55.57 30.14-23.38c3.921-3.050 4.641-8.7 1.591-12.63zM291.14 248.82c0-0.55-0.149-5.010-0.17-5.39-0.069-1.18-0.17-2.36-0.279-3.55-0.23-2.32-0.54-4.67-0.94-7.020-0.12-0.72-1.43-7.12-1.63-7.93-0.16-0.66-0.82-3.2-0.99-3.82-0.010-0.030-0.979-3.32-1.18-3.95-0.53-1.66-2.69-7.47-2.69-7.47-1.109-2.74-4.29-9.131-4.63-9.75-0.020-0.040-0.040-0.070-0.060-0.11-7.24 1.2-15.13 1.8-23.72 1.8-8.84 0-16.94-0.63-24.35-1.91-0.86 1.53-1.68 3.13-2.46 4.78-0.28 0.58-1.29 2.82-1.52 3.35-1.070 2.511-2.070 5.12-2.96 7.79-0.21 0.62-2.53 8.71-2.56 8.84-0.14 0.54-0.7 2.98-0.84 3.65-0.15 0.68-0.8 4.14-0.87 4.54-0.2 1.2-0.38 2.39-0.54 3.59-0.080 0.54-0.39 3.23-0.47 4.030-0.010 0.16-0.38 6.39-0.39 6.82-0.010 0.57 0.040 4.87 0.080 5.65 0.11 2.11 0.98 8.29 0.99 8.32 0.060 0.33 2.45 8.77 4.19 11.85 0.15 0.26 1.060 1.75 1.38 2.22 0.16 0.24 2.38 3.050 2.55 3.24 0.28 0.31 1.58 1.59 1.61 1.62 0.26 0.24 3.8 2.96 4.090 3.15 0.58 0.36 6.11 2.97 6.4 3.080 0.72 0.25 7.94 1.88 7.94 1.88 0.29 0.040 5.18 0.44 5.49 0.45 0.63 0.020 2.52 0.030 2.84 0.020 0.24 0 0.47-0.010 0.71-0.020 0.74-0.010 10.22-1.3 10.97-1.5 0.33-0.090 4.75-1.61 5.851-2.13 0.17-0.080 5.21-3.13 5.72-3.54 0.189-0.15 4.96-5.070 5.359-5.65 0.21-0.27 2.75-4.63 2.87-4.9 0.9-1.89 2.66-7.6 2.82-8.33 0.22-0.96 0.99-6.030 1.040-6.5 0.030-0.29 0.29-4 0.3-4.45 0.029-0.9 0.049-1.81 0.049-2.75zM327 116c0-57.13-32.3-136.44-72.15-136.44s-72.15 79.31-72.15 136.44c0 42.47 17.85 60.73 43.39 67.3 4.81 1.24 9.9 2.061 15.2 2.55 4.39 0.41 8.92 0.591 13.56 0.591 4.419 0 8.74-0.16 12.93-0.53h0.010c5.31-0.47 10.4-1.26 15.24-2.46 25.84-6.451 43.97-24.651 43.97-67.451zM389.26 383.020c-0.52-2.040-1.87-3.76-3.72-4.75l-74.79-40.1c0.24-1.29 2.15-13.030 2.19-13.35 0.050-0.36 0.699-6.9 0.71-7.13s0.020-5.27 0.020-5.27c-0.010-0.18-0.189-3.38-0.2-3.44v-0.1c-0.029-0.29-0.489-4.29-0.55-4.66 0-0.010-0.42-2.37-0.479-2.65-0.011-0.040-0.021-0.080-0.030-0.12-0.061-0.25-1.010-4.12-1.54-5.64-0.101-0.29-3.021-6.57-3.23-6.9-0.819-1.34-6.489-7.49-6.659-7.62-0.141-0.11-3.061-2.2-3.631-2.55-2.18 4-4.899 7.53-8.149 10.58-8.61 8.050-20.28 12.14-34.7 12.14-14.41 0-26.080-4.090-34.69-12.14-2.67-2.5-4.99-5.34-6.94-8.49-0.37 0.27-7.24 7.18-7.38 7.37-0.42 0.59-3.14 5.44-3.26 5.73-0.020 0.040-1.86 5.080-1.91 5.26-0.060 0.17-1.2 5.29-1.26 5.72-0.050 0.32-0.67 6.4-0.7 6.97-0.020 0.35-0.080 3.080-0.080 3.53 0 0.23 0.2 4.22 0.28 5.090 0.040 0.38 1.63 11.72 1.63 11.77 0.090 0.48 0.42 2.39 0.51 2.87v0.010l-75 40.21c-1.85 0.99-3.2 2.71-3.73 4.75-0.52 2.040-0.16 4.2 0.99 5.96l49.61 76.21c2.26 3.47 6.92 4.46 10.39 2.19 3.48-2.26 4.46-6.91 2.2-10.39l-45.15-69.35 63.74-34.17c0.070 0.33 10 30.82 16.62 51.85 6.77 21.5 21.2 21.5 21.2 21.5v-33.7c4.61 1.43 9.45 2.2 14.43 2.2s9.82-0.77 14.43-2.2v33.7c0 0 14.431 0 21.19-21.5 6.63-21.030 15.72-47.65 15.99-48.88l63.62 34.11-45.15 69.35c-2.26 3.48-1.28 8.13 2.2 10.39 3.47 2.27 8.13 1.28 10.39-2.19l49.61-76.21c1.148-1.76 1.508-3.92 0.978-5.96z" />
+<glyph unicode="&#xe633;" glyph-name="maven" horiz-adv-x="511" d="M503.875 337.497c0-5.691-0.368-11.839-1.103-18.447-0.735-6.608-1.838-13.49-3.305-20.649l-41.533-201.263h-89.514l32.072 154.458c2.135 10.642 4.068 20.851 5.798 30.616 1.726 9.767 2.591 17.642 2.591 23.623 0 10.642-2.599 18.446-7.793 23.402-5.197 4.956-14.45 7.434-27.76 7.434-6.33 0-13.514-1.699-21.552-5.093-8.036-3.399-17.735-8.492-29.096-15.281l-44.974-219.159h-89.513l32.002 154.458c1.806 8.99 3.609 18.721 5.416 29.184s2.708 18.447 2.708 23.954c0 11.193-2.49 19.315-7.47 24.366-4.984 5.046-14.249 7.571-27.801 7.571-7.022 0-14.696-1.838-23.023-5.507-8.329-3.673-17.721-8.63-28.167-14.867l-44.97-219.159h-88.763l63.794 309.19h88.77l-7.047-34.142c17.927 13.397 34.105 23.859 48.529 31.387 14.425 7.524 30.031 11.288 46.821 11.288 18.091 0 33.331-4.544 45.719-13.628 12.385-9.087 21.022-22.439 25.913-40.060 21.853 17.802 41.425 31.204 58.715 40.199 17.292 8.99 34.009 13.491 50.16 13.491 24.137 0 42.568-6.702 55.289-20.099 12.721-13.401 19.086-32.489 19.086-57.267l0.001-0.001z" />
+<glyph unicode="&#xe634;" glyph-name="gradle" horiz-adv-x="515" d="M424.7 180h86.52c-20.85-120.42-125.84-212-252.22-212-141.38 0-256 114.62-256 256 0 80.57 37.22 152.44 95.4 199.36l43.090-74.62-72.31-125.24 95.16-164.82h190.32l70.040 121.32zM215.62 388.32l-44.080 76.34c27.29 9.93 56.74 15.34 87.46 15.34 127.77 0 233.69-93.62 252.89-216h-85.45l-71.78 124.32h-139.040zM352 224c0-50.81-41.19-92-92-92s-92 41.19-92 92c0 50.81 41.19 92 92 92s92-41.19 92-92z" />
+<glyph unicode="&#xe635;" glyph-name="git" d="M489.356 245.599l-211.762 211.752c-12.193 12.198-31.971 12.198-44.174 0l-43.969-43.979 55.776-55.776c12.963 4.381 27.822 1.441 38.157-8.894 10.399-10.399 13.307-25.389 8.815-38.4l53.771-53.76c13.011 4.487 28.017 1.584 38.394-8.82 14.515-14.516 14.515-38.036 0-52.562-14.526-14.521-38.041-14.521-52.577 0-10.911 10.921-13.618 26.973-8.076 40.422l-50.144 50.139v-131.943c3.536-1.752 6.877-4.086 9.817-7.031 14.515-14.515 14.515-38.036 0-52.567-14.515-14.51-38.047-14.51-52.556 0-14.516 14.536-14.516 38.057 0 52.567 3.589 3.584 7.744 6.292 12.177 8.108v133.173c-4.434 1.816-8.577 4.502-12.177 8.113-10.995 10.99-13.639 27.13-8.002 40.632l-54.984 55-145.208-145.191c-12.198-12.209-12.198-31.987 0-44.185l211.773-211.757c12.193-12.199 31.966-12.199 44.169 0l210.781 210.775c12.199 12.199 12.199 31.987 0 44.185z" />
+<glyph unicode="&#xe636;" glyph-name="sbt" d="M323.558 216.575c-0.948 12.75-5.733 22.58-15.23 31.387-6.502 6.017-13.467 9.421-23.067 11.315-2.688 0.539-5.4 0.82-8.090 0.845-18.79 0.154-36.453-11.776-43.673-30.463-2.508-6.476-3.456-20.095-1.842-26.495 4.505-17.895 19.609-32.18 37.912-35.84 5.608-1.127 9.473-1 16.23 0.435 23.272 4.915 39.474 25.855 37.76 48.817zM323.558 216.575c-0.948 12.75-5.733 22.58-15.23 31.387-6.502 6.017-13.467 9.421-23.067 11.315-2.688 0.539-5.4 0.82-8.090 0.845-18.79 0.154-36.453-11.776-43.673-30.463-2.508-6.476-3.456-20.095-1.842-26.495 4.505-17.895 19.609-32.18 37.912-35.84 5.608-1.127 9.473-1 16.23 0.435 23.272 4.915 39.474 25.855 37.76 48.817zM256.001 480c-141.388 0-256-114.611-256-256 0-141.39 114.612-256 256-256 141.39 0 256 114.61 256 256 0 141.388-114.61 256-256 256zM162.561 142.183c-9.139-8.652-18.893-13.132-36.301-16.665-17.51-3.585-36.786-2.97-55.040 1.74-10.778 2.765-23.526 7.27-24.345 8.575-0.41 0.615-0.718 9.805-0.718 20.43-0.025 15.002 0.231 19.483 1.179 20.276 0.922 0.743 3.122 0.385 8.909-1.587 18.406-6.22 36.146-9.267 54.271-9.267 9.805 0 11.52 0.257 15.079 2.15 4.788 2.534 6.861 6.863 5.862 12.135-1.28 6.835-8.448 10.625-34.227 18.022-7.782 2.228-16.486 4.94-19.302 5.99-19.686 7.372-34.534 27.751-34.534 47.334 0 15.796 10.675 34.612 24.064 42.47 9.676 5.659 26.111 9.397 41.242 9.55 2.15 0.025 4.275-0.026 6.349-0.129 17.075-1.050 42.317-7.116 44.187-10.624 0.562-0.998 0.946-8.884 0.946-18.611 0-13.364-0.255-17.153-1.28-18.176-1.126-1.126-2.636-0.972-11.135 1.255-16.308 4.276-26.779 5.709-37.684 5.12-11.366-0.615-15.335-1.665-18.765-4.839-2.099-1.946-2.431-2.816-1.996-5.53 0.998-6.195 3.865-7.732 23.424-12.595 30.694-7.629 42.522-13.413 54.962-26.853 6.067-6.555 8.525-11.623 10.394-21.377 3.406-17.818-2.508-36.454-15.538-48.793zM365.313 188.724c-8.882-31.435-33.51-55.603-65.612-64.358-5.377-1.46-10.572-2.048-19.635-2.277-18.022-0.438-27.47 1.483-42.42 8.652-10.957 5.223-17.92 10.368-26.983 19.865-11.623 12.185-17.638 23.168-22.528 41.037l-2.458 8.96-0.306 91.391c-0.256 83.173-0.154 91.493 1.202 92.851 1.075 1.075 11.674 1.639 22.297 1.639 10.599 0.025 21.249-0.512 22.324-1.614 1.28-1.253 1.434-6.706 1.434-46.080 0-24.55 0.204-44.672 0.486-44.672 0.256 0 2.406 1.024 4.787 2.202 6.938 3.508 21.274 7.705 30.132 8.858 13.875 1.766 32.205-1.459 47.335-8.32 20.144-9.114 38.4-27.878 46.385-47.668 8.45-20.939 9.526-39.319 3.56-60.466zM467.151 132.583c-0.565-1.025-3.405-2.51-7.092-3.635-9.087-2.868-20.89-3.2-29.288-0.87-9.47 2.635-14.668 5.555-21.58 12.005-6.963 6.502-10.060 11.368-12.645 19.815-1.767 5.71-1.87 8.858-2.178 55.988l-0.308 49.945h-12.748c-17.357 0-16.385-1.178-16.385 20.096s-0.998 20.070 16.463 20.070h12.825l-0.077 26.701c-0.025 14.668-0.050 27.188-0.025 27.828 0.025 0.87 10.036 1.28 20.353 1.253 10.315-0.051 20.94-0.511 22.168-1.407 2.228-1.639 2.945-10.113 3.048-35.891l0.077-18.484h12.723c10.342 0 12.98-0.255 14.157-1.433 2.125-2.125 2.125-35.124 0-37.274-1.178-1.152-3.815-1.46-14.157-1.46h-12.723l-0.23-41.727c-0.308-57.112-0.283-57.6 2.022-59.93 1.715-1.715 3.045-1.895 13.387-1.945 8.858-0.077 11.623-0.385 12.262-1.382 1.127-1.793 1.074-26.113-0.050-28.262zM308.328 247.962c-6.502 6.017-13.467 9.421-23.067 11.315-2.688 0.539-5.4 0.82-8.090 0.845-18.79 0.154-36.453-11.776-43.673-30.463-2.508-6.476-3.456-20.095-1.842-26.495 4.505-17.895 19.609-32.18 37.912-35.84 5.608-1.127 9.473-1 16.23 0.435 23.272 4.915 39.475 25.855 37.76 48.817-0.948 12.75-5.733 22.58-15.231 31.387z" />
+<glyph unicode="&#xe637;" glyph-name="grails" d="M275.575 50.956c12.053 1.721 25.829 5.164 32.716 8.608 6.887 3.445 12.052 8.61 12.052 12.053 0 0-1.721 3.444-3.443 6.889-3.443 5.164-6.887 12.053-15.497 30.993-3.444 8.608-11.235 31.163-13.776 41.324-2.632 15.183-2.872 31.352 0 46.49 2.498 8.854 5.933 17.413 12.053 24.105 6.867 9.084 14.923 18.044 25.829 22.384 33.949 13.515 74.038 43.046 94.701 75.761 6.887 12.053 10.173 17.218 12.683 24.106 6.212 17.039 11.695 35.14 11.422 53.377v1.721h-380.524v-3.443c-0.283-45.12 26.388-85.786 58.542-115.363 17.218-15.497 37.881-27.549 61.987-36.159 8.608-3.444 12.053-5.165 18.94-12.052 8.609-10.332 15.496-22.384 18.94-36.158 2.085-19.901 0.525-40.932-5.165-60.264l-3.444-10.332c-1.721-6.887-6.887-17.217-15.496-34.435s-8.608-18.942-8.608-20.663c3.444-10.332 24.105-17.218 55.098-20.661 6.887 0 17.218 0 30.993 1.721zM130.941 109.498c12.053 1.721 22.384 5.164 25.828 10.331v1.721l-1.721 5.164c-12.053 22.384-18.941 41.324-18.941 60.264 0 10.332 1.722 15.497 5.166 24.106 5.165 8.61 6.887 11.388 15.496 14.832 3.444 1.761 7.553 2.426 9.274 3.483 4.5 1.331 9.666 4.070 9.666 4.070s-3.091 0.665-6.575 2.387c-10.331 3.444-14.087 6.222-22.696 11.388-27.549 15.496-44.768 30.993-61.986 53.376-5.166 8.61-7.838 12.413-10.331 15.882l-1.722 3.058c-1.722 1.721-70.595 1.721-72.317 0-1.167-24.106 10.386-45.344 25.827-63.708 18.040-21.453 32.716-27.549 46.49-30.993 12.053-3.444 13.775-5.165 18.94-12.053 3.444-8.608 5.166-13.776 5.166-24.105 1.722-15.497-3.444-30.993-13.775-53.377-3.444-6.887-6.888-13.774-6.888-13.774 0-1.721 3.444-5.166 6.888-6.889 8.608-5.164 32.714-8.608 48.21-5.164zM411.601 109.498c13.776 1.721 22.385 5.164 24.106 10.331 0 1.721 0 3.443-5.166 13.776-10.832 21.383-18.308 46.8-12.053 70.594 3.575 9.632 8.172 19.67 18.94 21.343 17.218 5.165 30.993 13.094 48.211 30.311 10.331 10.331 19.942 27.761 22.641 37.88 2.163 8.113 4.884 17.814 3.187 25.827-1.721 1.721-72.317 1.721-74.038 0 0 0-1.721-1.721-3.443-3.444-1.723-5.166-8.61-15.497-13.776-20.662-6.887-8.609-27.55-29.271-34.437-34.436-12.7-13.010-37.070-21.776-49.933-27.55 1.721-1.721 10.331-6.887 17.217-8.609 13.776-5.165 13.776-5.165 18.94-13.775 3.444-8.608 5.166-13.774 5.166-24.106 0.952-23.897-11.233-46.029-20.661-65.428 12.238-13.782 37.945-13.431 55.099-12.053z" />
+<glyph unicode="&#xe638;" glyph-name="groovy" d="M257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM465.233 255.576l-46.769-1.66-3.026 6.646c-2.351 5.161-5.070 6.637-12.19 6.637-5.036 0-10.73-1.892-12.649-4.21-3.177-3.819-3.719-3.819-5.853 0-2.718 4.844-13.099 5.603-17.435 1.267-2.084-2.093-4.494-2.118-8.271-0.091-6.662 3.561-30.467 3.352-35.011-0.308-6.495-5.245-19.486 9.68-43.616 50.127-23.372 39.171-23.981 39.906-27.874 33.685-2.184-3.502-8.363-13.357-13.732-21.912-5.362-8.546-9.756-16.059-9.756-16.684 0-1.842-22.171-37.387-26.598-42.649-2.96-3.502-6.178-4.352-11.815-3.119-5.453 1.201-9.314 0.3-12.982-3.018-2.876-2.601-6.045-3.911-7.046-2.918-0.992 1-2.351 12.14-3.018 24.763-1.076 20.545-1.91 23.497-7.963 28.258-3.719 2.926-8.813 5.311-11.323 5.311-12.056 0-39.147-25.556-57.082-53.846l-4.252-6.696-43.483 0.876c-23.922 0.483-43.49 0.325-43.49-0.35 0-0.684 7.579-3.927 16.843-7.213 40.856-14.483 66.695-25.139 66.695-27.482 0-1.401 3.102-5.645 6.895-9.438 6.312-6.305 6.537-7.296 2.693-11.539-5.879-6.505-5.478-8.272 5.803-25.406 10.431-15.834 13.299-17.126 27.265-12.257 4.636 1.618 9.605 2.526 11.039 2.019 1.434-0.501-6.42-15.217-17.459-32.702s-20.070-32.343-20.070-33.010c0-2.151 1.809-1.526 47.768 16.584 79.261 31.234 106.284 41.473 109.419 41.473 1.676 0 15.199-4.82 30.050-10.706 75.3-29.866 123.734-48.577 125.728-48.577 1.217 0-3.219 8.396-9.864 18.661-6.637 10.264-12.074 19.269-12.074 20.002 0 0.742 4.169 2.718 9.256 4.394 5.094 1.685 13.491 7.746 18.668 13.474 11.539 12.774 14.533 28.324 9.947 51.654-1.767 8.964-2.818 16.558-2.351 16.876 0.474 0.317 19.96 7.678 43.307 16.367 23.338 8.68 42.44 16.368 42.44 17.076s-21.045 0.55-46.767-0.357zM82.938 242.094c-1.593-4.72-3.019-8.697-3.168-8.846-0.967-0.951-44.742 16.15-44.742 17.476-0.008 0.909 11.423 1.268 25.398 0.8l25.398-0.851-2.885-8.579zM331.825 256.418c1.192 0 4.169-6.971 6.612-15.492 5.361-18.702 7.93-22.229 16.159-22.229 12.015 0 14.583 16.042 4.411 27.615-5.411 6.17-8.522 6.004-6.854-0.367 2.093-7.996-3.837-9.263-8.688-1.859-9.13 13.941 6.47 17.301 19.101 4.119 6.988-7.296 7.979-10.464 8.889-28.423 0.834-16.501 0.151-21.171-3.743-25.474-11.565-12.782-22.83-1.933-30.893 29.775-3.202 12.599-6.929 24.23-8.271 25.847-2.467 2.976-0.7 6.487 3.277 6.487zM314.633 253.048c12.682-13.532 13.766-32.284 2.585-44.458-11.548-12.582-34.219-5.819-38.563 11.49-2.034 8.121 3.443 29.716 8.938 35.211 5.954 5.953 20.495 4.745 27.040-2.243zM213.402 265.531c1.226 4.869 40.998 71.548 42.732 71.648 1.484 0.084 40.289-63.452 40.289-65.962 0-0.726-1.685-1.325-3.743-1.325-0.118 0-0.25-0.008-0.384-0.025-0.342-0.050-0.692-0.116-1.042-0.217-2.334-0.667-5.846-2.626-8.68-4.928-5.437-4.419-6.963-4.636-10.474-1.476-2.268 2.034-9.005 4.477-14.983 5.437-1.593 0.258-2.994 0.442-4.252 0.542-0.476 0.041-0.934 0.066-1.384 0.075-0.333 0.009-0.659 0.017-0.959 0.017-4.619-0.041-7.537-1.66-12.557-5.878-7.396-6.22-8.663-6.521-11.781-2.768-0.083 0.1-0.167 0.2-0.258 0.292-0.3 0.292-0.559 0.534-0.8 0.733-2.059 1.651-5.153 2.468-7.496 1.86-3.126-0.818-4.744-0.067-4.226 1.976zM263.638 207.882c-15.175-15.175-34.627-8.372-34.561 12.082 0.042 13.124 11.982 35.987 19.828 37.954 10.546 2.643 18.035-1.217 22.346-11.531 5.512-13.199 2.51-28.382-7.613-38.505zM181.984 250.031c3.727 4.861 3.927 4.82 5.57-1.017 0.942-3.335 2.885-6.070 4.327-6.070s5.019 2.735 7.946 6.070c3.685 4.194 5.745 5.028 6.72 2.693 1.66-4.002 9.030-4.553 9.030-0.675 0 1.484 1.218 2.693 2.693 2.693 5.011 0 2.743-8.288-4.161-15.184-3.769-3.769-8.313-6.262-10.106-5.528-14.25 5.837-13.649 6.029-11.69-3.752 2.577-12.899 10.18-20.078 17.26-16.284 4.928 2.635 5.544 1.967 6.645-7.146 0.684-5.645-0.075-10.914-1.734-12.024-8.547-5.736-23.163 2.61-23.163 13.224 0 8.537-6.237 30.992-9.522 34.276-3.101 3.101-3.077 4.461 0.184 8.722zM134.325 174.563c-8.38-2.401-16.35-4.377-17.71-4.377-2.401 0-17.835 21.671-16.317 22.913 0.417 0.332 7.429 2.76 15.576 5.387 32.743 10.539 43.124 18.918 43.107 34.827l-0.008 10.981-5.019-8.088c-11.948-19.235-28.808-27.573-46.251-22.879-10.255 2.76-16.084 10.923-16.084 22.521 0 14.833 38.455 64.435 52.729 68.012 9.805 2.468 12.882-2.010 12.323-17.918-1.076-30.284-22.354-56.815-38.596-48.118-4.636 2.476-5.32 4.845-4.228 14.575 1.243 11.006 10.631 28.274 15.367 28.274 4.094 0 4.827-9.922 1.218-16.434-4.244-7.654-4.836-17.627-1.184-19.886 7.471-4.619 21.662 25.664 21.662 46.243 0 13.19-8.397 11.756-23.755-4.052-20.978-21.595-29.2-43.591-21.654-57.923 4.203-7.98 7.521-9.839 17.693-9.881 11.723-0.058 25.664 14.016 30.308 30.584 3.502 12.524 8.179 16.826 8.179 7.521 0-2.735 2.443-12.074 5.436-20.753 12.865-37.404 5.945-50.385-32.793-61.526zM394.477 114.24c1.259-2.127-3.335-1.268-12.324 2.317-7.87 3.144-18.569 7.262-23.755 9.163-5.186 1.894-30.041 11.598-55.239 21.555-43.34 17.125-46.325 17.918-55.247 14.741-5.186-1.842-29.433-11.132-53.888-20.628-24.455-9.505-51.437-20.211-59.958-23.805-8.522-3.586-15.5-5.778-15.5-4.861s7.446 13.699 16.534 28.416c11.256 18.21 19.752 28.783 26.614 33.11 5.544 3.502 12.557 9.514 15.592 13.374l5.512 7.003 6.829-6.828c7.488-7.488 18.527-8.855 29.85-3.702 3.777 1.719 6.862 4.878 6.862 7.029 0 2.7 1.442 3.26 4.711 1.825 11.881-5.219 23.572-4.327 33.719 2.568l10.139 6.887 8.73-5.32c11.832-7.212 26.014-6.812 37.637 1.084l9.464 6.42 4.411-9.255c2.426-5.087 8.071-11.315 12.548-13.832 11.665-6.562 13.091-15.25 4.044-24.688-6.079-6.337-6.82-8.563-4.386-13.115 3.76-7.022 11.065-9.281 22.839-7.070 9.753 1.825 10.179 1.424 24.262-22.388zM401.439 151.61c-10.522-5.92-28.19-8.738-41.072-6.57l-7.454 1.268 5.437 6.912c2.993 3.802 5.445 9.914 5.445 13.582 0 4.978 1.075 6.245 4.277 5.019 19.969-7.661 37.204-3.502 43.007 10.389 5.587 13.382 4.945 21.045-0.81 9.538-5.812-11.64-14.8-13.783-20.445-4.886-2.176 3.427-5.261 16.25-6.854 28.491-1.601 12.249-4.836 25.998-7.195 30.567-2.369 4.569-3.685 8.922-2.936 9.672 3.144 3.143 7.304-3.035 11.289-16.726 5.136-17.685 11.682-26.548 17.843-24.189 8.971 3.443 8.396 15.692-1.868 40.089-1.584 3.76-1.151 4.761 1.659 3.852 4.051-1.325 7.479-11.173 14.332-41.273 8.206-36.012 3.904-55.305-14.656-65.737zM452.717 240.191c-15.567-5.845-28.457-10.639-28.658-10.672-0.867-0.117-3.61 12.524-3.643 16.792-0.034 4.219 3.151 4.711 30.275 4.611l30.317-0.108-28.291-10.623zM294.33 228.276c3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0 4.452-14.534 20.345-18.603 20.345-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.124-7.354 1.394-11.047 5.82-14.149zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM257.192 253.724c-4.611 0-5.128-5.77-0.884-10.006 1.642-1.651 2.176-4.319 1.184-5.929-2.735-4.428-9.889-3.511-13.907 1.785-3.26 4.286-3.594 4.044-3.668-2.693-0.042-4.077 2.343-9.839 5.303-12.798 2.969-2.969 6.437-5.387 7.721-5.387 5.319 0 16.534 11.598 16.534 17.111 0 7.488-7.154 17.917-12.282 17.917zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345zM302.076 256.418c-4.544 0-3.519-5.712 1.76-9.756 3.952-3.026 4.103-4.019 0.917-6.112-5.136-3.369-10.99-0.767-13.774 6.137-1.901 4.702-2.327 3.96-2.468-4.261-0.125-7.354 1.392-11.048 5.819-14.149 3.293-2.31 7.871-4.194 10.173-4.194 5.854 0 16.175 7.654 16.175 11.99 0.001 4.452-14.532 20.345-18.601 20.345z" />
+<glyph unicode="&#xe639;" glyph-name="stats" d="M64 32h448v-64h-512v512h64zM144 64c-26.51 0-48 21.49-48 48s21.49 48 48 48c1.414 0 2.811-0.074 4.194-0.193l51.596 85.993c-4.92 7.535-7.79 16.531-7.79 26.201 0 26.51 21.49 48 48 48s48-21.49 48-48c0-9.671-2.87-18.666-7.79-26.201l51.596-85.993c1.383 0.119 2.78 0.193 4.194 0.193 1.068 0 2.124-0.047 3.175-0.115l85.178 149.061c-5.268 7.704-8.353 17.018-8.353 27.055 0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-1.070 0-2.124 0.047-3.175 0.116l-85.178-149.062c5.268-7.703 8.353-17.018 8.353-27.055 0-26.51-21.49-48-48-48s-48 21.49-48 48c0 9.67 2.87 18.666 7.789 26.201l-51.595 85.992c-1.383-0.119-2.78-0.193-4.194-0.193s-2.811 0.073-4.194 0.193l-51.596-85.993c4.92-7.534 7.79-16.53 7.79-26.2 0-26.51-21.49-48-48-48z" />
+<glyph unicode="&#xe63a;" glyph-name="fingerprint" d="M19.557 167.733c-3.73 0-7.068 2.623-7.834 6.421-11.284 55.955-3.525 112.329 22.438 163.029 2.015 3.933 6.835 5.489 10.767 3.474 3.933-2.014 5.488-6.834 3.474-10.767-24.296-47.444-31.556-100.204-20.995-152.574 0.873-4.331-1.93-8.55-6.261-9.423-0.533-0.108-1.065-0.16-1.589-0.16zM61.291 358.042c-1.636 0-3.287 0.5-4.709 1.538-3.569 2.604-4.351 7.609-1.747 11.178 36.865 50.516 90.954 85.147 152.304 97.516 54.437 10.976 109.493 3.875 159.218-20.531 3.966-1.947 5.603-6.74 3.656-10.707s-6.738-5.604-10.707-3.657c-46.53 22.84-98.056 29.485-149.005 19.21-57.419-11.576-108.041-43.987-142.542-91.263-1.566-2.146-4.001-3.284-6.468-3.284zM493.394 263.277c-3.73 0-7.067 2.623-7.833 6.42-11.898 59.003-45.567 110.527-94.806 145.079-3.616 2.538-4.491 7.527-1.953 11.144 2.538 3.618 7.528 4.491 11.145 1.953 52.611-36.919 88.587-91.97 101.298-155.013 0.874-4.331-1.93-8.55-6.261-9.423-0.534-0.108-1.066-0.16-1.59-0.16zM498.306 210.645c-0.052 0-0.104 0-0.156 0.002-4.418 0.084-7.93 3.734-7.845 8.151 0.326 16.988-1.227 34.121-4.613 50.925-0.874 4.331 1.93 8.55 6.261 9.423 4.327 0.872 8.55-1.93 9.423-6.261 3.618-17.943 5.275-36.244 4.926-54.394-0.084-4.365-3.65-7.846-7.996-7.846zM21.999 157.445c-3.594 0-6.861 2.439-7.761 6.086-0.86 3.485-1.662 7.067-2.385 10.644-0.875 4.331 1.927 8.551 6.258 9.426 4.333 0.868 8.551-1.929 9.425-6.258 0.677-3.355 1.43-6.713 2.235-9.979 1.058-4.289-1.561-8.625-5.851-9.684-0.642-0.159-1.287-0.235-1.921-0.235zM194.086-18.018c-1.875 0-3.758 0.655-5.277 1.99-3.319 2.916-3.646 7.971-0.729 11.29 54.963 62.557 77.061 145.177 60.625 226.676-0.873 4.331 1.93 8.55 6.261 9.423 4.332 0.87 8.55-1.93 9.423-6.261 8.792-43.595 7.275-87.286-4.506-129.855-11.233-40.589-31.906-78.814-59.784-110.544-1.581-1.799-3.792-2.719-6.013-2.719zM162.844-7.314c-2.014 0-4.030 0.756-5.585 2.272-3.163 3.085-3.226 8.15-0.141 11.313 22.122 22.682 39.177 49.144 50.692 78.65 1.606 4.116 6.247 6.147 10.361 4.545 4.116-1.606 6.151-6.245 4.544-10.361-12.298-31.516-30.515-59.779-54.143-84.006-1.569-1.607-3.648-2.413-5.728-2.413zM227.92-24.531c-1.723 0-3.458 0.554-4.92 1.696-3.481 2.721-4.098 7.748-1.378 11.229 53.043 67.878 73.711 155.177 56.705 239.513l-0.418 2.072c-3.287 10.921-14.445 17.767-25.841 15.468-11.050-2.229-18.562-12.296-17.912-23.246l0.62-3.073c6.834-33.898 6.655-68.093-0.533-101.635-0.925-4.319-5.178-7.072-9.499-6.146-4.32 0.926-7.072 5.179-6.146 9.499 6.188 28.875 6.822 58.275 1.901 87.509l-0.093-0.016-1.53 7.591c-4.18 20.741 9.291 41.018 30.029 45.201 20.733 4.182 41.016-9.289 45.2-30.031l1.405-6.967-0.172-0.057c15.441-86.736-6.648-175.846-61.108-245.535-1.579-2.017-3.932-3.072-6.31-3.072zM134.292 7.004c-2.137 0-4.268 0.851-5.843 2.534-3.019 3.227-2.85 8.289 0.376 11.308 48.188 45.083 71.685 110.895 62.855 176.045-0.593 4.378 2.475 8.408 6.854 9.002 4.375 0.587 8.408-2.475 9.002-6.854 9.524-70.277-15.814-141.26-67.78-189.877-1.542-1.443-3.505-2.158-5.464-2.158zM322.405 162.348c-4.408 0-7.987 3.567-8 7.978-0.059 21.185-2.233 42.567-6.464 63.555l-0.549 2.721c-3.226 12.612-10.896 23.437-21.819 30.694-11.693 7.77-25.713 10.521-39.474 7.744-20.652-4.164-36.776-20.18-41.079-40.803-0.903-4.326-5.144-7.099-9.465-6.198-4.325 0.902-7.1 5.14-6.198 9.465 5.612 26.899 26.644 47.789 53.58 53.22 17.95 3.622 36.238 0.033 51.491-10.102s25.646-25.603 29.265-43.555l1.354-6.712-0.133-0.049c3.591-19.841 5.437-39.97 5.492-59.936 0.013-4.419-3.56-8.010-7.978-8.022-0.008 0-0.016 0-0.023 0zM264.199-26.071c-1.557 0-3.129 0.453-4.511 1.398-3.646 2.495-4.58 7.474-2.085 11.12 29.851 43.624 48.776 94.277 54.729 146.484 0.5 4.39 4.472 7.545 8.854 7.042 4.39-0.5 7.543-4.465 7.042-8.854-6.247-54.788-26.104-107.939-57.421-153.707-1.548-2.265-4.057-3.483-6.608-3.483zM108.498 24.429c-2.241 0-4.469 0.936-6.051 2.763-2.893 3.34-2.53 8.393 0.81 11.285 45.302 39.232 67.107 99.155 57.957 157.96l-1.524 7.559c-10.762 53.376 23.907 105.558 77.282 116.321 8.995 1.815 18.158 2.375 27.235 1.669 4.405-0.343 7.698-4.192 7.354-8.597s-4.211-7.693-8.597-7.355c-7.602 0.595-15.283 0.121-22.83-1.401-42.962-8.664-71.461-49.347-65.653-92.182l1.061-5.264c13.475-66.835-10.209-136.115-61.812-180.806-1.512-1.31-3.376-1.952-5.232-1.952zM302.734-21.692c-1.375 0-2.769 0.354-4.040 1.101-3.811 2.235-5.088 7.137-2.853 10.948 44.163 75.286 58.979 163.893 41.717 249.496l-0.547 2.708c-5.34 22.594-19.896 41.897-40.271 53.256-3.859 2.151-5.243 7.024-3.092 10.883 2.152 3.86 7.025 5.242 10.883 3.091 25.269-14.088 43.038-38.42 48.753-66.758l1.295-6.418-0.098-0.041c16.040-87.457 0.21-177.517-44.84-254.313-1.488-2.539-4.161-3.953-6.907-3.953zM85.553 44.636c-2.315 0-4.612 1-6.194 2.931-2.799 3.418-2.298 8.458 1.12 11.258 19.13 15.671 33.978 36.149 42.939 59.224 1.6 4.118 6.234 6.163 10.354 4.561 4.118-1.6 6.161-6.234 4.561-10.354-9.958-25.639-26.458-48.395-47.716-65.808-1.487-1.219-3.282-1.812-5.064-1.812zM377.668 97.997c-0.433 0-0.87 0.035-1.311 0.107-4.359 0.718-7.311 4.834-6.593 9.193 7.562 45.901 6.69 92.508-2.587 138.524l-0.422 2.092c-13.232 59.861-72.239 98.476-132.587 86.308-59.161-11.93-98.226-68.35-89.379-127.385l1.133-5.62c3.232-16.031 3.998-32.328 2.274-48.437-0.47-4.395-4.409-7.566-8.806-7.104-4.393 0.471-7.574 4.413-7.104 8.806 1.322 12.357 1.014 24.842-0.912 37.202l-1.279 6.342c-14.053 69.693 31.214 137.827 100.908 151.881 69.691 14.045 137.82-31.215 151.873-100.909l1.019-5.050-0.047-0.034c8.726-46.272 9.301-93.083 1.701-139.215-0.643-3.92-4.035-6.701-7.881-6.701zM343.192-10.106c-1.176 0-2.37 0.261-3.498 0.811-3.972 1.935-5.623 6.724-3.688 10.695 10.776 22.121 19.458 45.352 25.803 69.047 1.143 4.267 5.526 6.8 9.797 5.658 4.268-1.143 6.801-5.528 5.658-9.797-6.608-24.681-15.65-48.877-26.875-71.916-1.384-2.844-4.233-4.498-7.197-4.498zM385.23 10.911c-0.95 0-1.916 0.17-2.856 0.53-4.126 1.578-6.192 6.203-4.613 10.33 27.822 72.736 34.512 151.653 19.37 228.348l-0.344 1.681c-4.12 20.424-12.378 39.247-24.544 55.944-2.602 3.571-1.816 8.575 1.755 11.177 3.571 2.603 8.574 1.816 11.177-1.755 12.932-17.749 21.893-37.648 26.659-59.188l0.034-0.026 0.612-2.996c16.171-80.192 9.332-162.803-19.776-238.902-1.219-3.185-4.254-5.143-7.474-5.143zM352.307 332.38c-1.783 0-3.577 0.593-5.064 1.811-33.39 27.346-76.779 38.144-119.043 29.622-10.883-2.193-21.471-5.629-31.47-10.212-4.018-1.84-8.766-0.077-10.606 3.939-1.841 4.017-0.077 8.765 3.939 10.606 11.118 5.096 22.885 8.915 34.975 11.352 46.989 9.473 95.226-2.529 132.344-32.929 3.418-2.799 3.919-7.84 1.12-11.258-1.583-1.931-3.88-2.931-6.195-2.931zM65.527 67.31c-2.341 0-4.661 1.022-6.242 2.989-2.767 3.445-2.218 8.48 1.227 11.247 31.769 25.521 47.204 65.528 41.014 105.434l-1.024 5.076c-11.737 58.201 9.625 117.625 55.75 155.081 3.43 2.786 8.468 2.263 11.253-1.167s2.263-8.468-1.167-11.253c-39.982-32.468-59.281-83.283-51.186-133.781l1.148-5.69c9.573-47.455-7.964-95.802-45.768-126.171-1.477-1.189-3.247-1.765-5.005-1.765zM48.466 92.375c-2.27 0-4.525 0.961-6.107 2.828-2.856 3.371-2.439 8.419 0.932 11.275 22.255 18.858 32.921 47.943 28.275 76.541l-0.655 3.070c-1.987 9.854-3.202 19.919-3.611 29.913-0.181 4.414 3.251 8.14 7.666 8.32 4.42 0.187 8.14-3.251 8.32-7.666 0.319-7.79 1.173-15.629 2.543-23.358l0.859-4.023c7.116-35.293-5.549-71.696-33.053-95.004-1.505-1.273-3.342-1.896-5.169-1.896zM438.35 227.873c-3.899 0-7.313 2.854-7.903 6.826-0.964 6.493-2.086 13.058-3.343 19.565l-0.727 3.501c-18.889 93.679-110.473 154.528-204.144 135.64-70.621-14.241-124.221-69.292-136.552-140.248-0.756-4.354-4.9-7.271-9.251-6.512-4.353 0.756-7.269 4.898-6.512 9.251 6.459 37.168 23.714 71.276 49.9 98.636 26.8 28.001 61.121 46.867 99.253 54.557 100.282 20.219 198.363-43.212 221.66-142.075l0.106-0.006 1.262-6.086c1.593-7.913 2.997-15.945 4.174-23.874 0.649-4.37-2.368-8.439-6.738-9.088-0.398-0.058-0.795-0.087-1.185-0.087zM428.056 45.257c-0.682 0-1.375 0.088-2.065 0.272-4.27 1.138-6.808 5.521-5.669 9.79 12.357 46.35 17.092 94.121 14.070 141.987-0.278 4.409 3.071 8.21 7.48 8.488 4.403 0.273 8.21-3.070 8.488-7.48 3.13-49.596-1.775-99.093-14.58-147.116-0.954-3.579-4.188-5.941-7.724-5.941zM34.21 120.492c-1.946 0-3.896 0.705-5.436 2.133-3.241 3.003-3.433 8.064-0.429 11.306 10.967 11.832 15.909 28.093 13.451 43.91l-0.481 2.283c-11.589 57.476-0.103 116.023 32.344 164.857 32.446 48.833 81.97 82.11 139.447 93.698 24.124 4.865 48.614 5.676 72.789 2.411 4.378-0.592 7.448-4.621 6.856-8.999s-4.604-7.448-8.999-6.857c-22.404 3.028-45.111 2.274-67.484-2.239-53.289-10.744-99.202-41.594-129.284-86.868-29.347-44.169-40.198-96.913-30.734-148.939l0.818-3.883c4.349-21.557-2.003-44.081-16.99-60.251-1.575-1.7-3.718-2.562-5.868-2.562zM469.823 101.905c-0.329 0-0.662 0.021-0.998 0.063-4.385 0.546-7.496 4.542-6.95 8.927 6.143 49.338 4.468 99.247-4.976 148.426l-0.929 4.413c-14.569 72.254-67.267 131.133-137.527 153.659-4.207 1.349-6.524 5.853-5.176 10.061 1.35 4.208 5.857 6.523 10.061 5.176 73.563-23.584 129.273-84.121 146.844-158.937l0.111 0.006 1.431-6.799c10.547-52.3 12.578-105.452 6.038-157.981-0.504-4.050-3.951-7.014-7.929-7.014z" />
+<glyph unicode="&#xe63b;" glyph-name="box" d="M471.040 435.2h-430.080c-8.474 0-15.36-6.887-15.36-15.36v-61.44h460.8v61.44c0 8.474-6.887 15.36-15.36 15.36zM51.2 61.44c0-19.712 16.128-35.84 35.84-35.84h337.92c19.738 0 35.84 16.128 35.84 35.84v271.36h-409.6v-271.36zM179.2 281.6h153.6v-51.2h-153.6v51.2z" />
+<glyph unicode="&#xe63c;" glyph-name="book" d="M448 416v-416h-336c-26.511 0-48 21.49-48 48s21.489 48 48 48h304v384h-320c-35.199 0-64-28.8-64-64v-384c0-35.2 28.801-64 64-64h384v448h-32zM128 64h288v-32h-288z" />
+<glyph unicode="&#xe63d;" glyph-name="envelope-o" d="M475.428 45.714v219.428q-9.143-10.286-19.714-18.857-76.572-58.857-121.714-96.572-14.572-12.286-23.714-19.143t-24.714-13.857-29.286-7h-0.571q-13.714 0-29.285 7t-24.714 13.857-23.714 19.143q-45.143 37.714-121.715 96.572-10.572 8.572-19.715 18.857v-219.428q0-3.714 2.715-6.428t6.428-2.714h420.572q3.714 0 6.428 2.714t2.714 6.428zM475.428 346v7t-0.143 3.714-0.857 3.572-1.572 2.572-2.572 2.143-4 0.714h-420.572q-3.715 0-6.428-2.714t-2.715-6.429q0-48 42-81.143 55.143-43.428 114.571-90.572 1.714-1.428 10-8.428t13.143-10.714 12.714-9 14.429-7.857 12.286-2.572h0.572q5.714 0 12.286 2.572t14.428 7.857 12.714 9 13.143 10.714 10 8.428q59.428 47.143 114.572 90.572 15.428 12.286 28.714 33t13.286 37.572zM512 356.572v-310.857q0-18.857-13.428-32.286t-32.286-13.428h-420.572q-18.857 0-32.285 13.428t-13.428 32.286v310.857q0 18.857 13.428 32.286t32.285 13.428h420.572q18.857 0 32.286-13.428t13.428-32.286z" />
+<glyph unicode="&#xe63e;" glyph-name="envelope" d="M512 272.572v-226.857q0-18.857-13.428-32.286t-32.286-13.428h-420.572q-18.857 0-32.285 13.428t-13.428 32.286v226.857q12.572-14 28.857-24.857 103.429-70.286 142-98.572 16.285-12 26.429-18.714t27-13.714 31.428-7h0.572q14.572 0 31.428 7t27 13.714 26.428 18.714q48.572 35.143 142.286 98.572 16.286 11.143 28.572 24.857zM512 356.572q0-22.571-14-43.143t-34.857-35.143q-107.428-74.571-133.714-92.857-2.857-2-12.143-8.714t-15.428-10.857-14.857-9.286-16.428-7.714-14.286-2.572h-0.571q-6.571 0-14.286 2.572t-16.429 7.714-14.857 9.286-15.429 10.857-12.143 8.714q-26 18.286-74.857 52.143t-58.572 40.715q-17.715 12-33.428 33t-15.714 39q0 22.285 11.857 37.143t33.857 14.857h420.572q18.572 0 32.143-13.428t13.572-32.286z" />
+<glyph unicode="&#xe63f;" glyph-name="search" d="M4.56 16.752c-6.096-6.096-6.096-15.984 0-22.096l22.096-22.096c6.112-6.096 16-6.096 22.096 0l154.688 154.688c1.68 1.68 2.8 3.664 3.552 5.776 31.728-23.184 70.688-37.024 113.008-37.024 106.032 0 192 85.968 192 192s-85.968 192-192 192c-106.032 0-192-85.968-192-192 0-42.32 13.84-81.28 37.024-113.008-2.112-0.752-4.096-1.856-5.776-3.552l-154.688-154.688zM320 416c70.688 0 128-57.312 128-128s-57.312-128-128-128-128 57.312-128 128c0 70.688 57.312 128 128 128z" />
+<glyph unicode="&#xe640;" glyph-name="docker" horiz-adv-x="507" d="M493.12 258.073c-16.787 9.692-39.148 11.021-58.191 5.415-2.351 20.244-15.649 37.998-31.467 50.712l-6.287 5.042-5.265-6.095c-10.596-12.244-13.755-32.617-12.307-48.265 1.064-11.5 4.68-23.169 11.765-32.415-5.383-3.234-11.5-5.809-16.946-7.659-11.085-3.754-23.137-5.84-34.84-5.84h-25.361v51.265h-50.159v100.306h-60.179v-50.148h-100.308v-50.159h-50.159v-51.265h-42.882l-0.702-7.586c-2.362-25.308 1.107-50.647 11.563-73.775l4.511-9.169 0.511-0.862c30.935-52.531 85.275-74.668 144.486-74.668 114.625 0 209.155 51.201 252.579 159.348 29.019-1.521 58.701 7.063 72.892 34.775l3.628 7.075-6.884 3.968zM111.927 312.030h43.478v-43.467h-43.478v43.467zM164.671 135.949c0-6.627-5.372-11.99-11.989-11.99-6.627 0-11.989 5.361-11.989 11.99 0 6.616 5.362 11.989 11.989 11.989 6.617 0 11.989-5.372 11.989-11.989zM111.927 261.883h43.478v-43.467h-43.478v43.467zM61.779 261.883h43.467v-43.467h-43.467v43.467zM170.905 61.259c-62.031 0.383-95.54 21.341-122.775 48.563 2.35-0.128 4.67-0.233 6.957-0.319 0.947-0.032 1.883-0.075 2.819-0.108 4.66-0.159 9.181-0.233 13.564-0.233 6.415 0 12.51 0.171 18.319 0.5 0.298 0.022 0.596 0.032 0.894 0.054 0.203 0.010 0.394 0.031 0.596 0.043 0.010 0 0.010 0 0.022 0 3.701 0.233 7.276 0.519 10.723 0.882 3.425 0.361 6.723 0.786 9.903 1.275 6.373 0.99 12.224 2.245 17.564 3.766 9.075-20.914 25.372-40.063 55.063-54.159-4.521-0.168-9.064-0.265-13.649-0.265zM205.553 218.416h-43.467v43.467h43.467v-43.467zM205.553 268.563h-43.467v43.467h43.467v-43.467zM255.712 218.416h-43.467v43.467h43.467v-43.467zM255.712 268.563h-43.467v43.467h43.467v-43.467zM255.712 318.722h-43.467v43.467h43.467v-43.467zM305.86 218.416h-43.467v43.467h43.467v-43.467zM161.267 135.949c0-4.746-3.84-8.596-8.585-8.596s-8.595 3.85-8.595 8.596c0 4.745 3.851 8.584 8.595 8.584 1.095 0 2.138-0.202 3.107-0.575-1.042-0.606-1.755-1.745-1.755-3.041 0-1.937 1.574-3.5 3.511-3.5 1.319 0 2.479 0.733 3.075 1.82 0.415-1.011 0.649-2.127 0.649-3.288z" />
+<glyph unicode="&#xe641;" glyph-name="users" d="M367.497 77.313c-9.476 1.494-9.692 27.327-9.692 27.327s27.844 27.328 33.912 64.076c16.326 0 26.407 39.069 10.082 52.814 0.681 14.47 20.984 113.588-81.799 113.588s-82.479-99.118-81.799-113.588c-16.327-13.745-6.244-52.814 10.081-52.814 6.067-36.748 33.913-64.076 33.913-64.076s-0.216-25.833-9.692-27.327c-30.524-4.816-144.503-54.658-144.503-109.313h384c0 54.655-113.979 104.497-144.503 109.313zM172.027 68.595c22.047 13.575 48.813 26.154 70.769 33.712-7.876 11.216-16.647 26.468-22.165 44.531-7.703 6.283-13.972 15.266-17.999 26.301-4.033 11.052-5.561 23.426-4.304 34.842 0.902 8.196 3.239 15.833 6.825 22.544-2.175 23.293-3.707 69.017 26.224 102.366 11.607 12.933 26.278 22.23 43.85 27.843-3.137 32.38-19.58 70.385-83.227 70.385-102.782 0-82.479-99.118-81.799-113.588-16.327-13.745-6.244-52.814 10.081-52.814 6.067-36.748 33.913-64.076 33.913-64.076s-0.216-25.833-9.692-27.327c-30.524-4.817-144.503-54.659-144.503-109.314h164.798c2.355 1.537 4.753 3.070 7.229 4.595z" />
+<glyph unicode="&#xe642;" glyph-name="phone" d="M384 480h-256c-26.528 0-48-21.488-48-48v-416c0-26.528 21.488-48 48-48h256c26.496 0 48 21.504 48 48v416c0 26.528-21.504 48-48 48zM400 16c0-8.816-7.184-16-16-16h-256c-8.832 0-16 7.152-16 16v32.064h288v-32.064zM400 64.064h-288v319.936h288v-319.936zM400 400h-288v32c0 8.832 7.168 16 16 16h256c8.816 0 16-7.168 16-16v-32zM288 424c0-4.416-3.6-8-8-8h-48c-4.432 0-8 3.584-8 8v0c0 4.432 3.568 8 8 8h48c4.4 0 8-3.568 8-8v0zM272 24.064c0-4.4-3.6-8-8-8h-16c-4.416 0-8 3.6-8 8v0c0 4.432 3.584 8 8 8h16c4.4 0 8-3.568 8-8v0z" />
+<glyph unicode="&#xe643;" glyph-name="mobile" d="M384 480h-288c-17.6 0-32-14.399-32-32v-448c0-17.6 14.399-32 32-32h288c17.6 0 32 14.4 32 32v448c0 17.601-14.4 32-32 32zM240-8.891c-13.746 0-24.891 11.145-24.891 24.891s11.145 24.891 24.891 24.891 24.891-11.145 24.891-24.891-11.145-24.891-24.891-24.891zM384 64h-288v352h288v-352z" />
+<glyph unicode="&#xe644;" glyph-name="flag" d="M416 393.847c38.233 0 72.546 20.811 96 36.553v-297.845c-23.454-15.743-57.767-36.555-96-36.555s-72.546 11.335-96 27.078c-23.454 15.74-57.767 27.075-96 27.075s-72.545-19.458-96-35.198v297.845c23.455 15.742 57.767 35.2 96 35.2s72.546-11.334 96-27.076c23.454-15.742 57.767-27.077 96-27.077zM64 480c17.673 0 32-14.327 32-32v-480h-64v480c0 17.673 14.327 32 32 32z" />
+<glyph unicode="&#xe645;" glyph-name="flag-checkered" d="M237.714 189.714v54.857q-51.714-4.571-109.715-33.428v-52.857q58.572 27.428 109.715 31.428zM237.714 309.143v56.286q-49.143-2.286-109.715-36v-54q61.428 31.714 109.715 33.714zM475.428 176.857v52.572q-67.143-33.143-109.714-20.286v64q-5.714 1.714-11.143 4.286-1.428 0.857-9.428 4.857t-9.857 4.857-9 4.286-9.857 4.428-9.286 3.714-10.286 3.571-10 2.429-11.286 2.143-11.286 1.143-12.572 0.571q-6.572 0-14-0.857v-63.428h5.428q29.143 0 55-8.286t56.428-23.428q5.428-2.572 11.143-4.286v-53.714q12-4.857 26-4.857 34.286 0 83.714 26.286zM475.428 298.857v54q-48.286-26-87.428-26-12.857 0-22.286 2.286v-56q42.286-12 109.714 25.715zM91.428 402.286q0-10-5-18.285t-13.285-13.143v-361.714q0-4-2.572-6.572t-6.572-2.572h-18.285q-4 0-6.572 2.572t-2.572 6.572v361.714q-8.285 4.857-13.285 13.143t-5 18.286q0 15.143 10.715 25.857t25.857 10.715 25.857-10.715 10.715-25.857zM512 384v-218q0-11.143-10-16.286-2.857-1.428-4.857-2.572-62.286-33.143-105.428-33.143-25.143 0-45.143 10l-8 4q-18.286 9.428-28.286 13.714t-26 8.286-32.572 4q-29.143 0-67.286-12.572t-65.285-29.143q-4.285-2.572-9.428-2.572-4.572 0-9.143 2.286-9.143 5.428-9.143 16v212q0 10 8.857 15.714 10 6 22.428 12.143t32.572 14.857 43.571 14.143 44.286 5.428q32 0 59.714-8.857t59.714-24.571q10.857-5.429 25.428-5.429 34.857 0 88.572 32 6.286 3.429 8.857 4.857 8.857 4.572 17.714-0.572 8.857-5.714 8.857-15.714z" />
+<glyph unicode="&#xe646;" glyph-name="shield" d="M96.107 353.493v-1.493c3.413-93.867 20.907-177.813 28.907-186.016 18.56-24.747 76.053-65.504 108.48-85.984 8-5.12 14.827-6.080 22.507-6.293 7.68 0.213 14.496 1.493 22.496 6.293 33.077 19.52 91.317 61.227 109.771 85.984 8.105 8.203 24.319 92.149 27.732 186.016l0.107 1.493c0 8.64-5.547 16.107-13.227 18.88-40.213 13.974-99.093 17.707-146.773 17.707-47.787 0-106.667-3.733-146.773-17.707-7.691-2.773-13.227-10.24-13.227-18.88zM0 415.040l0.107-2.347c5.44-150.186 29.536-282.24 42.56-295.36 29.867-39.691 125.333-101.333 176.96-135.040 12.267-8 24-13.984 36.373-14.293 12.373 0.309 24.107 6.293 36.373 14.293 51.627 33.707 147.094 95.35 176.96 135.040 13.013 13.12 37.12 145.173 42.56 295.36l0.107 2.347c0 13.867-8.96 25.92-21.333 30.293-64.747 22.4-157.654 34.667-234.667 34.667-77.024 0-169.931-12.267-234.667-34.667-12.373-4.373-21.333-16.426-21.333-30.293zM51.733 380.16c0 11.093 7.147 20.587 16.96 24.107 51.2 17.706 126.4 22.4 187.307 22.4s136.107-4.693 187.317-22.4c9.813-3.52 16.96-13.013 16.96-24.107l-0.117-1.813c-4.373-118.934-24.96-226.88-35.307-237.334-23.691-31.36-99.211-81.696-140.053-108.363-9.707-6.303-18.987-11.103-28.8-11.317-9.813 0.213-19.093 5.013-28.8 11.317-40.853 26.667-116.373 77.003-140.053 108.363-10.347 10.454-30.934 118.4-35.318 237.334l-0.096 1.813z" />
+<glyph unicode="&#xe647;" glyph-name="code" d="M85.334 224v21.334h21.334c21.333 0 21.333 0 21.333 21.334v50.901c0 10.965 0.512 19.114 1.558 24.363 1.152 5.376 2.965 9.877 5.482 13.504 4.352 5.952 10.090 10.133 17.238 12.458 7.147 2.454 18.602 5.44 39.147 5.44h21.91v-21.334h-16.042c-9.75 0-16.427-4.075-19.968-8.704-3.563-4.587-6.656-9.494-6.656-22.784v-39.616c0-15.552-0.875-25.173-5.206-31.851-4.267-6.549-11.989-11.286-23.254-14.23 11.413-3.306 19.2-8.214 23.381-14.677 4.245-6.464 5.077-16.149 5.077-31.659v-39.723c0-13.206 3.094-18.091 6.656-22.656 3.542-4.694 10.219-8.683 19.968-8.683l16.042-0.086v-21.334h-21.91c-20.544 0-32 2.837-39.147 5.291-7.147 2.325-12.886 6.55-17.238 12.608-2.518 3.52-4.331 7.978-5.482 13.334-1.046 5.397-1.558 13.568-1.558 24.512v50.923c0 21.334 0 21.334-21.334 21.334h-21.334zM426.666 224v21.334h-21.334c-21.334 0-21.334 0-21.334 21.334v50.901c0 10.965-0.512 19.114-1.558 24.363-1.152 5.376-2.966 9.877-5.483 13.504-4.352 5.952-10.091 10.133-17.238 12.458-7.147 2.454-18.603 5.44-39.147 5.44h-21.909v-21.334h16.043c9.75 0 16.426-4.075 19.968-8.704 3.563-4.587 6.656-9.494 6.656-22.784v-39.616c0-15.552 0.875-25.173 5.205-31.851 4.267-6.549 11.99-11.286 23.253-14.23-11.413-3.306-19.2-8.214-23.382-14.677-4.245-6.464-5.077-16.149-5.077-31.659v-39.723c0-13.206-3.094-18.091-6.656-22.656-3.541-4.694-10.219-8.683-19.968-8.683l-16.043-0.086v-21.334h21.909c20.544 0 32 2.837 39.147 5.291 7.147 2.325 12.885 6.55 17.238 12.608 2.517 3.52 4.33 7.978 5.483 13.334 1.046 5.397 1.558 13.568 1.558 24.512v50.923c0 21.334 0 21.334 21.334 21.334h21.334z" />
+<glyph unicode="&#xe648;" glyph-name="stopwatch" d="M256.001 383.394v32.606h64v32c0 17.673-14.327 32-32.001 32h-95.999c-17.673 0-32-14.327-32-32v-32h64v-32.606c-107.399-8.169-192-97.901-192-207.394 0-114.875 93.125-208 208-208s208 93.125 208 208c0 109.492-84.601 199.224-192 207.394zM353.138 62.863c-30.221-30.22-70.399-46.863-113.137-46.863s-82.917 16.643-113.137 46.863c-30.22 30.22-46.863 70.4-46.863 113.137s16.643 82.917 46.863 113.137c29.020 29.019 67.224 45.509 108.057 46.774l-10.839-157.010c-0.93-13.145 6.232-18.901 15.918-18.901s16.849 5.756 15.918 18.901l-10.838 157.011c40.833-1.266 79.038-17.756 108.058-46.775 30.22-30.22 46.863-70.4 46.863-113.137s-16.643-82.917-46.863-113.137z" />
+<glyph unicode="&#xe649;" glyph-name="rocket" d="M352 448l-160-160h-96l-96-128c0 0 101.708 28.326 161.033 15.042l-161.033-207.042 210.951 164.072c29.419-67.327-18.951-164.072-18.951-164.072l128 96v96l160 160 32 160-160-32z" />
+<glyph unicode="&#xe64a;" glyph-name="cloudbees-logo" d="M337.537 311.48c0 0-36.63 28.625-73.009 28.625-64.289 0-93.385-46.885-93.385-116.351 0-5.375 0.208-76.767 0.208-76.767l52.651-39.781 52.989 39.776c0 0 0.13 53.589 0.13 81.719 0 28.131 3.211 49.063 16.291 65.32 17.968 22.333 44.123 17.458 44.123 17.458zM164.832 265.72c0 0-22.429 17.529-44.706 17.529-39.367 0-57.182-28.708-57.182-71.246 0-3.29 0.127-47.005 0.127-47.005l32.239-24.359 32.338 23.25c0 0 0.189 33.918 0.189 51.148 0 17.223 1.966 30.041 9.976 39.995 11.002 13.673 27.018 10.688 27.018 10.688zM57.867 228.446c0 0-12.572 9.825-25.056 9.825-22.063 0-32.048-16.090-32.048-39.93 0-1.844 0.072-26.344 0.072-26.344l18.068-13.651 18.124 13.031c0 0 0.106 19.009 0.106 28.666 0 9.652 1.102 16.837 5.59 22.416 6.167 7.662 15.144 5.989 15.144 5.989zM410.246 265.719c0 0-22.432 17.529-44.707 17.529-39.365 0-57.18-28.709-57.18-71.245 0-3.29 0.125-47.005 0.125-47.005l32.24-24.359 32.337 23.25c0 0 0.19 33.918 0.19 51.148 0 17.224 1.966 30.041 9.976 39.995 11.004 13.674 27.019 10.688 27.019 10.688zM477.169 233.595c0 0-14.52 11.346-28.938 11.346-25.481 0-37.012-18.584-37.012-46.115 0-2.132 0.082-30.425 0.082-30.425l20.868-15.768 21.003 15.766c0 0 0.050 21.238 0.050 32.388 0 11.148 1.273 19.445 6.457 25.889 7.12 8.851 17.488 6.919 17.488 6.919zM512.071 210.992c0 0-6.474 5.060-12.904 5.060-11.363 0-16.505-8.288-16.505-20.565 0-0.95 0.037-13.567 0.037-13.567l9.306-7.032 9.365 7.030c0 0 0.026 9.471 0.026 14.442 0 4.973 0.567 8.673 2.877 11.546 3.177 3.947 7.799 3.086 7.799 3.086z" />
+<glyph unicode="&#xe64b;" glyph-name="lock" horiz-adv-x="384" d="M352 256c-16 0-32 0-32 0s0 32 0 96-64 128-128 128-128-64-128-128 0-96 0-96-16 0-32 0-32-16-32-32 0-208 0-224 16-32 32-32 304 0 320 0 32 16 32 32 0 208 0 224-16 32-32 32zM256 192h-192v-32h192v-32h-192v-32h192v-32h-192v-32h192v-32h-224v224h224v-32zM256 256h-128s0 64 0 96 32 64 64 64 64-32 64-64 0-96 0-96z" />
+<glyph unicode="&#xe64c;" glyph-name="ban" d="M374.857 220.286q0 46-24.857 84.286l-215.429-215.143q39.143-25.428 84.857-25.428 31.714 0 60.428 12.428t49.572 33.286 33.143 49.857 12.286 60.714zM89.428 134.857l215.714 215.428q-38.572 26-85.714 26-42.286 0-78-20.857t-56.572-56.857-20.857-78.285q0-46.286 25.428-85.428zM438.857 220.286q0-44.857-17.428-85.714t-46.714-70.286-70-46.857-85.286-17.428-85.286 17.428-70 46.857-46.715 70.286-17.428 85.714 17.428 85.572 46.715 70.143 70 46.857 85.286 17.428 85.286-17.428 70-46.857 46.714-70.143 17.428-85.572z" />
+<glyph unicode="&#xe64d;" glyph-name="insert-template" d="M192 384h64v-32h-64zM288 384h64v-32h-64zM448 384v-128h-96v32h64v64h-32v32zM160 288h64v-32h-64zM256 288h64v-32h-64zM96 352v-64h32v-32h-64v128h96v-32zM192 192h64v-32h-64zM288 192h64v-32h-64zM448 192v-128h-96v32h64v64h-32v32zM160 96h64v-32h-64zM256 96h64v-32h-64zM96 160v-64h32v-32h-64v128h96v-32zM480 448h-448v-448h448v448zM512 480v0-512h-512v512h512z" />
+<glyph unicode="&#xe64e;" glyph-name="plug" d="M512 338.75l-45.253 45.25-89.373-89.376-50.75 50.751 89.375 89.375-45.25 45.25-89.375-89.375-57.374 57.375-43.313-43.312 256.001-256 43.312 43.311-57.376 57.376 89.376 89.375zM397.020 143.105l-221.912 221.912c-47.909-57.452-102.26-146.227-64.698-222.608l-66.124-66.124c-15.556-15.557-15.556-41.012 0-56.568l7.429-7.429c15.557-15.557 41.013-15.557 56.569 0l66.123 66.122c76.382-37.566 165.159 16.783 222.613 64.695z" />
+<glyph unicode="&#xe64f;" glyph-name="puzzle" d="M437.334 234.667h-32v85.333c0 23.574-19.094 42.667-42.666 42.667h-85.334v32c0 29.44-23.893 53.333-53.334 53.333s-53.334-23.893-53.334-53.333v-32h-85.334c-23.573 0-42.453-19.094-42.453-42.667l-0.106-81.066h31.893c31.787 0 57.6-25.814 57.6-57.6s-25.814-57.6-57.6-57.6h-31.894l-0.106-81.067c0-23.574 19.093-42.666 42.666-42.666h81.067v32c0 31.786 25.814 57.6 57.6 57.6s57.6-25.813 57.6-57.6v-32h81.067c23.574 0 42.666 19.094 42.666 42.666v85.334h32c29.44 0 53.334 23.894 53.334 53.334s-23.894 53.334-53.334 53.334z" />
+<glyph unicode="&#xe650;" glyph-name="enlarge" d="M19.829 151.264l-19.829-154.581c0-15.883 12.8-28.683 28.683-28.683l154.56 19.84c4.587 0.64 9.173 2.773 12.693 6.4 8.96 8.96 8.96 23.349 0 32.32l-25.813 25.813 57.387 57.28c9.493 9.493 9.493 24.853 0 34.347l-51.52 51.52c-9.504 9.493-24.853 9.493-34.357 0l-57.26-57.28-25.813 25.707c-8.96 8.96-23.36 8.96-32.32 0-3.627-3.52-5.76-8.107-6.411-12.683zM492.16 151.264c-0.64 4.587-2.773 9.163-6.4 12.683-8.96 8.96-23.36 8.96-32.32 0l-25.813-25.707-57.28 57.28c-9.493 9.493-24.853 9.493-34.347 0l-51.52-51.52c-9.504-9.493-9.504-24.853 0-34.347l57.387-57.28-25.813-25.813c-8.96-8.971-8.96-23.36 0-32.32 3.52-3.627 8.107-5.76 12.683-6.4l154.58-19.84c15.883 0 28.683 12.8 28.683 28.683l-19.84 154.581zM19.829 296.736c0.651-4.576 2.784-9.163 6.411-12.683 8.96-8.96 23.36-8.96 32.32 0l25.813 25.707 57.269-57.28c9.504-9.493 24.853-9.493 34.357 0l51.52 51.52c9.493 9.493 9.493 24.853 0 34.347l-57.387 57.28 25.813 25.813c8.96 8.96 8.96 23.36 0 32.32-3.52 3.627-8.117 5.76-12.693 6.4l-154.569 19.84c-15.883 0-28.683-12.8-28.683-28.683l19.829-154.581zM492.16 296.736l19.84 154.581c0 15.883-12.8 28.683-28.683 28.683l-154.581-19.84c-4.587-0.64-9.163-2.773-12.683-6.4-8.96-8.96-8.96-23.36 0-32.32l25.813-25.813-57.387-57.28c-9.504-9.493-9.504-24.853 0-34.347l51.52-51.52c9.493-9.493 24.853-9.493 34.347 0l57.28 57.28 25.813-25.707c8.96-8.96 23.36-8.96 32.32 0 3.628 3.52 5.761 8.107 6.401 12.683z" />
+<glyph unicode="&#xe651;" glyph-name="map" d="M0 384l160 64v-384l-160-64zM352 384v-384l-160 53.333v384zM512 448v-384l-128-51.2v384z" />
+<glyph unicode="&#xe652;" glyph-name="globe" d="M240 448c-132.548 0-240-107.452-240-240s107.452-240 240-240c132.549 0 240 107.451 240 240s-107.451 240-240 240zM375.795 128c4.29 20.227 6.998 41.696 7.879 64h63.723c-1.668-22.098-6.812-43.557-15.34-64h-56.262zM104.205 288c-4.29-20.227-6.998-41.696-7.879-64h-63.722c1.668 22.097 6.811 43.557 15.339 64h56.262zM343.018 288c4.807-20.481 7.699-41.927 8.64-64h-95.658v64h87.018zM256 320v93.669c7.295-2.123 14.522-5.685 21.614-10.685 13.291-9.37 26.006-23.804 36.77-41.743 7.441-12.401 13.876-26.208 19.248-41.242h-77.632zM165.616 361.242c10.764 17.939 23.478 32.374 36.77 41.743 7.091 5 14.319 8.562 21.614 10.685v-93.67h-77.632c5.373 15.033 11.808 28.84 19.248 41.242zM224 288v-64h-95.657c0.94 22.073 3.833 43.519 8.639 64h87.018zM47.944 128c-8.528 20.443-13.671 41.902-15.339 64h63.722c0.881-22.304 3.589-43.773 7.879-64h-56.262zM128.343 192h95.657v-64h-87.018c-4.806 20.48-7.699 41.927-8.639 64zM224 96v-93.67c-7.294 2.123-14.522 5.686-21.614 10.685-13.292 9.37-26.007 23.805-36.77 41.743-7.441 12.402-13.875 26.209-19.249 41.242h77.633zM314.384 54.758c-10.764-17.938-23.479-32.373-36.77-41.743-7.092-4.999-14.319-8.562-21.614-10.685v93.67h77.633c-5.373-15.033-11.808-28.84-19.249-41.242zM256 128v64h95.657c-0.94-22.073-3.833-43.52-8.64-64h-87.017zM383.674 224c-0.881 22.304-3.589 43.773-7.879 64h56.262c8.528-20.443 13.672-41.903 15.34-64h-63.723zM415.329 320h-47.95c-9.319 29.381-22.188 55.147-37.658 75.714 21.268-10.17 40.529-23.808 57.357-40.636 10.74-10.739 20.181-22.469 28.251-35.078zM92.922 355.078c16.829 16.829 36.090 30.466 57.357 40.636-15.471-20.567-28.338-46.333-37.658-75.714h-47.949c8.069 12.609 17.511 24.339 28.25 35.078zM64.672 96h47.949c9.32-29.381 22.188-55.147 37.659-75.715-21.268 10.17-40.529 23.808-57.357 40.637-10.74 10.739-20.182 22.469-28.251 35.078zM387.078 60.922c-16.828-16.829-36.090-30.467-57.357-40.637 15.471 20.567 28.339 46.334 37.658 75.715h47.95c-8.070-12.609-17.511-24.339-28.251-35.078z" />
+<glyph unicode="&#xe653;" glyph-name="key" horiz-adv-x="448" d="M320.45 448.050c-70.7 0-128-57.3-128-128 0-9.8 1.1-19.3 3.2-28.45l-195.65-195.6v-32l32-32h64l32 32v32h32v32h32v32h64l35.4 35.4c9.35-2.15 19.050-3.3 29.050-3.3 70.7 0 128 57.3 128 128s-57.35 127.95-128 127.95zM192 224l-160-160v32l160 160v-32zM352 320c-17.65 0-32 14.35-32 32s14.35 32 32 32 32-14.35 32-32c0-17.65-14.35-32-32-32z" />
+<glyph unicode="&#xe654;" glyph-name="aid" d="M448 352h-96v64c0 17.6-14.4 32-32 32h-128c-17.6 0-32-14.4-32-32v-64h-96c-35.2 0-64-28.8-64-64v-256c0-35.2 28.8-64 64-64h384c35.2 0 64 28.8 64 64v256c0 35.2-28.8 64-64 64zM192 416h128v-64h-128v64zM384 128h-96v-96h-64v96h-96v64h96v96h64v-96h96v-64z" />
+<glyph unicode="&#xe655;" glyph-name="pulse" horiz-adv-x="448" d="M368 224.031l-86.406 83.172-70.391-99.203-35.203 220.797-99.781-204.766h-76.219v-64.031h115.203l28.797 57.594 28.797-172.781 115.203 163.187 51.188-48h108.813v64.031h-80z" />
+<glyph unicode="&#xe656;" glyph-name="siren" d="M88.121 61.668c15.856 0 31.353 0 47.312 0-0.4 28.020 7.266 54.309 11.899 81.038 7.412 42.759 15.373 85.422 23.422 128.068 3.904 20.686 23.022 37.019 45.136 37.514 30.91 0.691 61.86 0.768 92.765-0.010 24.087-0.606 41.776-18 46.063-41.856 9.822-54.649 20.187-109.2 30.066-163.84 2.406-13.302 3.786-26.788 5.724-40.8 14.599 0 29.885 0 45.678 0 0-14.873 0-29.244 0-44.087-115.863 0-231.75 0-348.064 0 0 14.646 0 29.017 0 43.973zM257.849 83.536c34.329 0 68.311 0 103.313 0-0.672 9.217-0.553 18.181-2.093 26.851-8.105 45.632-16.889 91.145-24.872 136.798-3.057 17.483-12.776 28.937-29.616 31.569-14.974 2.34-30.512 1.070-45.802 1.351-0.305 0.005-0.617-0.511-0.93-0.793 0.002-65.146 0.002-130.288 0.002-195.774zM410.385 183.762c-2.695 13.376-5.168 25.644-7.815 38.788 33.737 6.835 67.19 13.612 101.521 20.565 2.644-12.857 5.269-25.61 7.99-38.834-34-6.86-67.465-13.611-101.695-20.519zM271.658 342.947c-12.877 0-25.405 0-38.544 0 0 34.196 0 68.361 0 102.992 12.692 0 25.36 0 38.544 0 0-34.315 0-68.49 0-102.992zM101.68 183.755c-34.292 6.923-67.739 13.674-101.68 20.527 2.676 13.132 5.25 25.76 7.914 38.825 33.924-6.859 67.346-13.617 101.523-20.527-2.594-12.982-5.072-25.385-7.757-38.825zM162.75 311.033c-8.508-8.489-17.5-17.461-26.078-26.020-23.761 23.762-47.942 47.946-71.787 71.794 8.6 8.597 17.597 17.591 26.055 26.046 23.746-23.748 47.92-47.926 71.812-71.82zM421.253 382.721c8.319-8.325 17.31-17.323 25.904-25.923-23.827-23.83-48.010-48.013-71.758-71.762-8.562 8.55-17.55 17.524-25.933 25.894 23.584 23.582 47.755 47.757 71.788 71.79z" />
+<glyph unicode="&#xe657;" glyph-name="health" d="M443.413 401.216c-128.875 18.326-257.514 18.368-386.688-0.043-33.386-4.992-56.725-36.587-56.725-70.464v-234.667c0-33.877 19.37-65.493 52.95-70.528 64.448-9.173 126.208-13.803 191.317-13.803s136.661 4.651 201.258 13.824c33.43 5.014 66.475 36.63 66.475 70.507v234.624c0 33.877-34.966 65.493-68.587 70.55zM42.666 330.667c0 12.906 3.797 26.41 16.299 28.288 56.362 8 110.635 12.266 167.018 13.056l-83.606-148.394h-99.712v107.050zM469.334 96.043c0-12.906-19.37-26.389-31.914-28.267-124.906-17.77-249.792-17.728-374.378-0.022-12.715 1.899-20.373 15.36-20.373 28.288v84.906h125.035l37.781 58.838 18.112-153.174 109.696 94.336h136.043v-84.906zM469.334 223.616h-151.21l-60.971-60.011-23.274 208.555c3.499 0.022 6.891 0.192 10.389 0.192 63.104 0 132.65-4.522 194.944-13.354 12.714-1.92 30.123-15.402 30.123-28.288v-107.094zM341.376 320.043h21.248v-21.376h-21.248zM384 320.043h21.376v-21.376h-21.376z" />
+<glyph unicode="&#xe658;" glyph-name="format-color-fill" d="M353.28 278.613l-190.72 190.72-30.186-30.186 50.774-50.774-109.76-109.76c-12.48-12.48-12.48-32.746 0-45.227l117.334-117.334c6.186-6.293 14.4-9.387 22.613-9.387s16.427 3.094 22.613 9.387l117.333 117.334c12.48 12.48 12.48 32.746 0 45.227zM111.040 256l102.294 102.186 102.293-102.186h-204.587zM405.334 224s-42.666-46.187-42.666-74.667c0-23.574 19.094-42.666 42.666-42.666s42.666 19.094 42.666 42.666c0 28.48-42.666 74.666-42.666 74.666zM0 42.667h512v-85.333h-512z" />
+<glyph unicode="&#xe659;" glyph-name="thermometer" d="M277.334 147.819v118.848c0 5.867-4.8 10.667-10.666 10.667s-10.666-4.8-10.666-10.667v-118.848c-18.346-4.779-32-21.334-32-41.152 0-23.531 19.114-42.666 42.666-42.666s42.666 19.136 42.666 42.666c0 19.819-13.654 36.373-32 41.152zM341.334 182.208v169.792c0 41.173-33.493 74.666-74.666 74.666s-74.666-33.493-74.666-74.666v-169.792c-19.669-19.243-32-45.888-32-75.541 0-58.816 47.851-106.666 106.666-106.666s106.666 47.851 106.666 106.666c0 29.654-12.33 56.298-32 75.541zM266.666 42.667c-35.286 0-64 28.714-64 64 0 23.574 12.95 43.99 32 55.104v190.23c0 17.642 14.357 32 32 32s32-14.358 32-32v-190.23c19.050-11.115 32-31.531 32-55.104 0-35.286-28.714-64-64-64z" />
+<glyph unicode="&#xe65a;" glyph-name="graduation" d="M84.531 173.107c11.879-48.154 26.983-69.145 77.363-91.187 50.406-22.016 74.343-46.080 94.106-46.080s42.163 21.043 92.57 43.111c50.406 21.99 36.966 28.749 48.845 76.851l-141.415-68.762-171.469 86.067zM499.481 298.599l-213.12 119.347c-16.691 9.344-44.007 9.344-60.697 0l-213.145-119.347c-16.691-9.344-16.691-24.653 0-33.997l213.12-119.347c16.691-9.344 44.006-9.344 60.698 0l137.779 77.159-149.401 34.995c-5.735-1.433-12.058-2.227-18.714-2.227-26.905 0-48.717 12.979-48.717 28.979s21.811 29.005 48.717 29.005c20.889 0 38.682-7.859 45.594-18.841l158.233-51.917 39.654 22.195c16.691 9.344 16.691 24.653 0 33.997zM434.355 72.397c-1.613-9.805 32.845-26.010 36.121 2.791 14.822 129.817-10.649 167.194-10.649 167.194l-35.712-19.994c0 0.026 30.285-28.8 10.24-149.99z" />
+<glyph unicode="&#xe65b;" glyph-name="pie" d="M224 192v224c-123.712 0-224-100.288-224-224s100.288-224 224-224 224 100.288 224 224c0 36.017-8.514 70.042-23.618 100.191l-200.382-100.191zM456.382 356.191c-36.776 73.408-112.687 123.809-200.382 123.809v-224l200.382 100.191z" />
+<glyph unicode="&#xe65c;" glyph-name="bars" d="M144 288h-96c-8.8 0-16-7.2-16-16v-288c0-8.8 7.2-16 16-16h96c8.8 0 16 7.2 16 16v288c0 8.8-7.2 16-16 16zM144 0h-96v128h96v-128zM304 352h-96c-8.8 0-16-7.2-16-16v-352c0-8.8 7.2-16 16-16h96c8.8 0 16 7.2 16 16v352c0 8.8-7.2 16-16 16zM304 0h-96v160h96v-160zM464 416h-96c-8.8 0-16-7.2-16-16v-416c0-8.8 7.2-16 16-16h96c8.8 0 16 7.2 16 16v416c0 8.8-7.2 16-16 16zM464 0h-96v192h96v-192z" />
+<glyph unicode="&#xe65d;" glyph-name="loop" d="M64 320h320v-96l128 128-128 128v-96h-384v-192h64zM448 128h-320v96l-128-128 128-128v96h384v192h-64z" />
+<glyph unicode="&#xe65e;" glyph-name="vmware" d="M420.675 385.406c13.179 0 24.998 0.048 36.815-0.010 26.156-0.128 41.63-14.277 41.762-40.379 0.414-83.991 0.397-167.987 0.054-251.978-0.1-24.478-14.904-38.021-39.539-38.062-33.68-0.059-67.362-0.015-101.046-0.015-4.598 0-9.193 0-14.298 0-1.039-17.075-0.771-33.216-3.295-48.906-3.259-20.281-14.736-28.464-35.372-28.464-85.274-0.002-170.544-0.026-255.815-0.041-23.892-0.005-37.033 12.887-37.053 36.798-0.066 85.274-0.066 170.545-0.005 255.818 0.015 22.715 13.509 36.196 36.355 36.495 12.746 0.166 25.495 0.030 39.757 0.030 0.24 5.148 0.622 9.61 0.63 14.075 0.054 31.977 0.371 63.957-0.059 95.928-0.456 33.375 16.778 46.835 46.157 46.459 80.996-1.039 162.014-0.32 243.021-0.353 29.14-0.010 41.945-12.851 41.933-41.779-0.005-11.407 0-22.812 0-35.614zM89.654 286.81c-3.2 0.571-4.431 0.976-5.665 0.983-11.082 0.072-22.167 0.146-33.249 0.074-15.772-0.1-19.655-3.84-19.666-19.438-0.064-83.981-0.079-167.962-0.034-251.945 0.010-17.011 5.163-22.106 22.016-22.116 44.334-0.028 88.671 0.028 133.005 0.041 39.647 0.013 79.293 0.138 118.938-0.074 10.199-0.054 18.348 3.18 19.108 13.916 1.072 15.14 0.272 30.41 0.272 46.707-5.558 0-9.736 0-13.911 0-34.102-0.005-68.209-0.089-102.31 0.015-25.278 0.077-39.132 13.762-39.742 39.147-0.236 9.8-0.487 19.63 0.041 29.404 0.43 7.974-2.826 10.575-10.427 10.309-11.070-0.384-22.178 0.259-33.244-0.176-13.594-0.535-23.286 5.74-28.291 17.541-3.674 8.663-6.346 18.43-6.541 27.769-0.743 35.709-0.299 71.45-0.299 107.843zM343.683 73.127c39.158 0 77.020-0.031 114.885 0.013 18.158 0.023 22.167 4.216 22.159 22.723-0.023 81.902-0.034 163.801-0.057 245.704 0 3.837 1.198 8.404-0.45 11.351-2.826 5.048-7.122 12.498-11.405 12.928-15.483 1.559-31.219 0.614-48.161 0.614 0-7.342 0-13.22 0-19.095-0.002-58.44-0.015-116.88-0.005-175.319 0.005-26.099-11.901-38.213-37.824-38.32-12.99-0.054-25.979-0.010-39.142-0.010 0-21.041 0-39.749 0-60.587zM401.93 366.618c-12.086 0-22.649 0.005-33.211 0-54.123-0.031-108.247-0.192-162.37 0.007-10.458 0.038-18.087-3.584-18.796-14.298-0.97-14.715-0.243-29.54-0.243-44.969 5.002-0.305 8.745-0.724 12.49-0.727 33.242-0.023 66.545-1.193 99.702 0.453 25.817 1.282 44.813-14.413 43.986-44.702-0.883-32.363-0.22-64.773-0.166-97.162 0.007-4.524 0.387-9.044 0.642-14.654 8.256 0 15.421 0 22.592 0 35.372-0.002 35.374-0.002 35.374 35.026 0.002 59.643 0 119.286 0 181.026zM108.501 306.765c9.666 0 17.316 0.020 24.965-0.002 34.852-0.105 34.852-0.108 34.898 34.027 0 0.428-0.007 0.853-0.007 1.28 0.128 29.289 14.28 43.303 43.883 43.318 57.992 0.031 115.986 0.013 173.977 0.016 4.928 0 9.858 0 14.172 0 0.855 2.719 1.313 3.507 1.321 4.301 0.108 11.51 0.207 23.019 0.205 34.529 0 17.229-2.553 19.786-20.050 19.791-83.577 0.028-167.155 0.016-250.734 0.016-2.56 0-5.12 0.021-7.675-0.087-9.254-0.394-14.651-6.070-14.748-14.48-0.463-40.402-0.207-80.806-0.207-122.709zM188.017 287.88c0-46.428 0-91.32 0-137.339 43.856 0 86.835-0.151 129.805 0.414 2.271 0.031 6.356 6.070 6.4 9.349 0.461 37.514 0.3 75.036 0.305 112.555 0.002 10.005-5.499 14.91-14.999 14.948-40.054 0.166-80.108 0.071-121.51 0.071zM323.527 73.195c0 21.168 0 40.481 0 59.536-45.939 0-90.811 0-136.33 0 0-15.542-0.213-30 0.074-44.444 0.192-9.705 6.034-14.93 15.36-14.986 39.975-0.246 79.952-0.105 120.896-0.105zM108.465 287.242c0-41.423-0.179-81.374 0.13-121.321 0.074-9.562 7.091-14.541 15.685-15.033 14.285-0.819 28.649-0.226 43.371-0.226 0 46.151 0 91.026 0 136.579-19.697 0-38.638 0-59.187 0z" />
+<glyph unicode="&#xe65f;" glyph-name="ec2" d="M145.626 22.481c-11.727 5.233-23.446 10.488-35.185 15.695-10.277 4.559-20.569 9.086-30.877 13.572-1.413 0.615-2.237 1.208-2.198 3.019 0.629 29.095 1.172 58.192 1.74 87.288 0.004 0.194 0.085 0.387 0.209 0.921 1.007-0.313 2.019-0.553 2.975-0.933 20.322-8.089 40.625-16.226 60.974-24.244 2.224-0.875 2.932-1.99 2.924-4.392-0.095-29.204-0.063-58.409-0.058-87.613 0-1.104 0.065-2.209 0.1-3.313-0.202 0-0.403 0-0.605 0zM0.001 189.255c0.153 1.377 0.417 2.752 0.442 4.132 0.458 25.157 0.888 50.316 1.321 75.474 0.018 0.999 0.002 2 0.002 3.452 1.155-0.36 2.062-0.576 2.919-0.918 20.685-8.241 41.373-16.475 62.018-24.815 0.919-0.371 2.051-1.736 2.053-2.641 0.099-30.396 0.075-60.794 0.058-91.191 0-0.182-0.111-0.364-0.28-0.883-22.868 10.057-45.702 20.098-68.534 30.139-0.001 2.418-0.001 4.834-0.001 7.252zM294.272 425.519c6.836-3.039 13.654-6.117 20.51-9.108 8.447-3.687 16.924-7.302 25.974-11.2-6.248-2.336-11.939-4.483-17.644-6.592-10.060-3.719-20.113-7.46-30.216-11.060-1.274-0.454-3.024-0.562-4.233-0.060-13.242 5.496-26.421 11.144-39.613 16.756-0.544 0.232-1.064 0.522-2.035 1.003 7.018 3.012 13.665 5.875 20.323 8.718 8.115 3.464 16.239 6.903 24.349 10.377 0.699 0.299 1.322 0.773 1.981 1.167 0.2 0 0.402 0 0.603 0zM441.71 425.519c8.688-3.822 17.367-7.666 26.068-11.461 6.611-2.884 13.25-5.705 20.516-8.83-5.161-1.947-9.757-3.707-14.37-5.413-11.092-4.105-22.18-8.225-33.312-12.219-1.284-0.461-3.039-0.644-4.238-0.144-13.233 5.523-26.399 11.204-39.579 16.853-0.534 0.229-1.020 0.569-1.811 1.017 10.673 4.594 21.084 9.038 31.463 13.557 4.918 2.141 9.774 4.423 14.659 6.641 0.201 0 0.402 0 0.603 0zM219.768 155.323c-0.996 0.354-1.839 0.594-2.631 0.945-21.131 9.3-42.253 18.619-63.388 27.909-1.53 0.673-2.637 1.238-2.59 3.376 0.632 28.893 1.149 57.788 1.7 86.683 0.007 0.397 0.085 0.793 0.173 1.567 4.199-1.677 8.264-3.305 12.333-4.925 17.245-6.872 34.489-13.749 51.744-20.6 1.639-0.651 2.872-1.177 2.864-3.489-0.096-29.808-0.064-59.616-0.070-89.425 0-0.585-0.075-1.17-0.133-2.039zM437.941 279.387c-6.913 3.035-13.596 5.963-20.276 8.899-15.247 6.704-30.489 13.415-45.738 20.112-1.399 0.614-2.546 1.068-2.503 3.136 0.601 29.079 1.089 58.163 1.611 87.244 0.005 0.296 0.084 0.592 0.168 1.172 1.555-0.571 3.050-1.080 4.515-1.665 20.027-7.997 40.041-16.027 60.089-23.972 1.619-0.642 2.313-1.331 2.309-3.191-0.065-29.893-0.046-59.787-0.051-89.68 0-0.574-0.067-1.148-0.125-2.056zM450.102 287.938c0 1.28 0 2.174 0 3.068 0 27.571 0.015 55.141-0.033 82.711-0.003 1.897 0.3 3.043 2.351 3.812 18.868 7.070 37.686 14.272 56.522 21.428 0.832 0.315 1.689 0.563 2.995 0.995 0-1.365 0-2.42 0-3.475 0-26.766-0.038-53.531 0.062-80.296 0.009-2.517-0.805-3.58-3.108-4.503-18.712-7.484-37.361-15.127-56.031-22.717-0.733-0.298-1.483-0.553-2.757-1.023zM158.026 31.122c0 1.477 0 2.462 0 3.445 0 27.279 0.031 54.558-0.053 81.837-0.008 2.477 0.678 3.687 3.094 4.59 18.506 6.92 36.948 14.006 55.415 21.029 1.018 0.387 2.075 0.672 3.336 1.075 0.054-1.065 0.138-1.93 0.138-2.794 0.007-27.077-0.027-54.154 0.064-81.232 0.008-2.3-0.764-3.256-2.826-4.082-18.903-7.571-37.758-15.262-56.628-22.914-0.639-0.259-1.29-0.486-2.541-0.954zM142.668 272.356c0-1.428 0-2.423 0-3.418 0-26.786-0.041-53.572 0.067-80.358 0.011-2.542-0.849-3.577-3.112-4.486-18.535-7.431-37.013-15.003-55.513-22.524-0.915-0.373-1.871-0.648-3.281-1.132 0 1.342 0 2.392 0 3.44 0 27.289 0.030 54.579-0.054 81.869-0.007 2.339 0.559 3.538 2.874 4.405 18.697 7.001 37.339 14.147 56.001 21.24 0.831 0.316 1.695 0.542 3.018 0.961zM293.732 275.812c0-1.379 0-2.276 0-3.174 0-26.97-0.033-53.94 0.058-80.909 0.008-2.274-0.661-3.33-2.763-4.171-18.712-7.495-37.379-15.104-56.060-22.675-0.901-0.365-1.821-0.683-3.077-1.152 0 1.368 0 2.361 0 3.353 0 27.373 0.033 54.745-0.058 82.117-0.008 2.404 0.701 3.444 2.978 4.297 18.684 6.998 37.308 14.157 55.952 21.265 0.826 0.315 1.668 0.591 2.969 1.050zM286.733 291.060c-19.315 5.603-38.63 11.205-58.102 16.854 0 30.070 0 60.115 0 90.554 4.756-1.948 9.369-3.811 13.961-5.723 14.626-6.091 29.239-12.21 43.87-18.287 1.464-0.608 2.49-1.104 2.437-3.142-0.7-26.454-1.284-52.911-1.904-79.368-0.004-0.19-0.108-0.38-0.262-0.889zM303.985 281.056c0 10.546 0 20.705 0 30.863 0 18.413 0.017 36.826-0.028 55.239-0.004 1.74 0.188 2.901 2.102 3.705 17.103 7.188 34.153 14.498 51.223 21.763 0.625 0.267 1.297 0.426 2.094 0.683 0.043-0.995 0.11-1.78 0.11-2.566 0.005-27.368-0.004-54.736 0.026-82.103 0.002-1.605-0.175-2.683-1.942-3.476-17.204-7.726-34.355-15.574-51.524-23.379-0.528-0.239-1.096-0.39-2.060-0.729zM102.975 148.526c15.222 6.541 30.044 12.932 44.901 19.239 0.906 0.385 2.245 0.452 3.131 0.075 14.761-6.281 29.481-12.654 44.208-19.016 0.171-0.074 0.299-0.243 0.697-0.577-4.643-1.725-9.135-3.403-13.632-5.062-11.379-4.197-22.75-8.418-34.159-12.529-1.101-0.397-2.62-0.5-3.663-0.063-13.413 5.613-26.775 11.347-40.145 17.062-0.356 0.152-0.661 0.426-1.335 0.871zM118.79 277.508c-10.020-3.71-19.496-7.227-28.98-10.726-6.302-2.325-12.596-4.675-18.939-6.881-1.115-0.387-2.629-0.514-3.672-0.078-13.413 5.617-26.776 11.356-40.145 17.076-0.345 0.148-0.634 0.422-1.287 0.866 7.542 3.241 14.779 6.348 22.012 9.461 7.37 3.171 14.71 6.413 22.131 9.459 1.237 0.507 3.022 0.646 4.215 0.145 14.43-6.051 28.796-12.251 43.174-18.421 0.363-0.156 0.684-0.409 1.491-0.901zM176.447 280.961c7.686 3.297 14.678 6.289 21.663 9.293 7.649 3.29 15.273 6.643 22.964 9.834 1.15 0.478 2.804 0.689 3.89 0.231 14.42-6.086 28.78-12.313 43.154-18.51 0.438-0.189 0.856-0.428 1.834-0.92-7.756-2.869-15.009-5.553-22.263-8.234-8.655-3.2-17.3-6.423-25.98-9.556-0.933-0.337-2.211-0.495-3.074-0.132-13.867 5.845-27.69 11.788-42.188 17.994z" />
+<glyph unicode="&#xe660;" glyph-name="pivotal" d="M0 477.899c170.667 0 341.331 0 512 0 0-170.667 0-341.331 0-512-170.667 0-341.334 0-512 0 0 170.669 0 341.334 0 512zM154.357 395.144c0-118.436 0-235.1 0-351.575 18.804 0 36.724 0 56.156 0 0 100.445 0 200.067 0 300.293 18.169 0 34.822 0.357 51.449-0.137 9.539-0.284 19.228-1.079 28.512-3.149 27.378-6.102 41.752-24.36 42.281-52.395 0.651-34.586-10.834-52.54-40.507-59.605-14.926-3.554-30.583-4.049-46.274-5.974 0-14.737 0-29.798 0-45.497 26.986-1.201 53.063-0.653 78.399 7.642 16.423 5.379 31.522 13.245 42.95 26.538 30.192 35.117 30.203 75.692 17.218 116.516-11.481 36.105-41.846 52.281-76.509 60.469-50.476 11.918-101.875 4.005-153.677 6.873z" />
+<glyph unicode="&#xe661;" glyph-name="clock" d="M329.372 105.372l-105.372 105.373v141.255h64v-114.745l86.628-86.627zM256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 32c-106.039 0-192 85.961-192 192s85.961 192 192 192c106.039 0 192-85.961 192-192s-85.961-192-192-192z" />
+<glyph unicode="&#xe662;" glyph-name="calendar-o" horiz-adv-x="476" d="M36.572 0h402.286v292.572h-402.286v-292.572zM146.286 347.429v82.285q0 4-2.571 6.572t-6.571 2.572h-18.285q-4 0-6.572-2.572t-2.572-6.572v-82.285q0-4 2.572-6.572t6.572-2.572h18.285q4 0 6.572 2.572t2.571 6.572zM365.714 347.429v82.285q0 4-2.572 6.572t-6.572 2.572h-18.286q-4 0-6.572-2.572t-2.572-6.572v-82.285q0-4 2.572-6.572t6.572-2.572h18.286q4 0 6.572 2.572t2.572 6.572zM475.428 365.714v-365.714q0-14.857-10.857-25.714t-25.714-10.857h-402.286q-14.857 0-25.715 10.857t-10.857 25.714v365.714q0 14.857 10.857 25.714t25.715 10.857h36.572v27.428q0 18.857 13.428 32.285t32.285 13.429h18.285q18.857 0 32.285-13.429t13.428-32.285v-27.428h109.714v27.428q0 18.857 13.428 32.285t32.286 13.429h18.286q18.857 0 32.286-13.429t13.428-32.285v-27.428h36.572q14.857 0 25.714-10.857t10.857-25.714z" />
+<glyph unicode="&#xe663;" glyph-name="calendar" d="M448 0h-384c-17.664 0-32 14.336-32 32v336c0 17.664 14.336 32 32 32h32v-16c0-26.512 21.488-48 48-48s48 21.488 48 48v16h128v-16c0-26.512 21.504-48 48-48s48 21.488 48 48v16h32c17.664 0 32-14.336 32-32v-336c0-17.664-14.336-32-32-32zM448 288h-384v-256h384v256zM209.104 162.736c3.152 5.024 4.736 10.336 4.736 15.888 0 12.368-6.656 18.56-19.968 18.56-11.568 0-22.624-4.592-33.184-13.776v26.064c11.68 7.568 24.88 11.344 39.568 11.344 13.744 0 24.48-3.456 32.208-10.352s11.584-16.24 11.584-27.984c0-15.68-9.408-31.904-28.224-48.656l-27.664-24.56v-0.56h54.56v-24.56h-88.496v23.056l38.528 36.848c7.744 7.424 13.2 13.648 16.352 18.688zM317.392 109.344c4.224 3.248 6.336 7.776 6.336 13.6 0 6-2.608 10.624-7.824 13.872s-12.384 4.88-21.52 4.88h-12.096v22.688h11.152c17.504 0 26.256 5.808 26.256 17.44 0 10.944-6.72 16.4-20.16 16.4-8.992 0-17.744-2.912-26.256-8.72v24.192c9.44 4.752 20.432 7.12 32.992 7.12 13.744 0 24.448-3.088 32.112-9.28s11.488-14.224 11.488-24.096c0-17.568-8.912-28.56-26.72-32.992v-0.464c9.504-1.184 16.992-4.64 22.496-10.352s8.256-12.736 8.256-21.040c0-12.56-4.592-22.496-13.776-29.808s-21.872-10.976-38.064-10.976c-13.872 0-25.152 2.256-33.84 6.752v25.776c8.992-6.56 19.504-9.84 31.504-9.84 7.552-0.032 13.44 1.6 17.664 4.848zM367.504 352c-17.408 0-31.504 14.096-31.504 31.504v32.992c0 17.408 14.096 31.504 31.504 31.504s31.504-14.096 31.504-31.504v-32.992c0-17.408-14.096-31.504-31.504-31.504zM143.504 352c-17.408 0-31.504 14.096-31.504 31.504v32.992c0 17.408 14.096 31.504 31.504 31.504s31.504-14.096 31.504-31.504v-32.992c0-17.408-14.112-31.504-31.504-31.504z" />
+<glyph unicode="&#xe664;" glyph-name="remove" d="M400 416h-288c-26.51 0-48-21.49-48-48v-16h384v16c0 26.51-21.49 48-48 48zM316.16 448l7.058-50.5h-134.436l7.057 50.5h120.321zM320 480h-128c-13.2 0-25.495-10.696-27.321-23.769l-9.357-66.962c-1.827-13.073 7.478-23.769 20.678-23.769h160c13.2 0 22.505 10.696 20.679 23.769l-9.357 66.962c-1.827 13.073-14.122 23.769-27.322 23.769v0zM408 320h-304c-17.6 0-30.696-14.341-29.103-31.869l26.206-288.263c1.593-17.527 17.297-31.868 34.897-31.868h240c17.6 0 33.304 14.341 34.897 31.868l26.205 288.263c1.594 17.528-11.502 31.869-29.102 31.869zM192 32h-48l-16 224h64v-224zM288 32h-64v224h64v-224zM368 32h-48v224h64l-16-224z" />
+<glyph unicode="&#xe665;" glyph-name="cancel-circle" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM384 306.745l-82.744-82.745 82.744-82.744v-45.256h-45.256l-82.744 82.744-82.745-82.744h-45.255v45.256l82.745 82.744-82.745 82.745v45.255h45.255l82.745-82.745 82.744 82.745h45.256v-45.255z" />
+<glyph unicode="&#xe666;" glyph-name="content-paste" d="M405.334 426.667h-89.28c-8.747 24.747-32.214 42.666-60.053 42.666s-51.306-17.92-60.053-42.666h-89.28c-23.573 0-42.666-19.094-42.666-42.666v-341.334c0-23.574 19.093-42.666 42.666-42.666h298.666c23.574 0 42.666 19.094 42.666 42.666v341.334c0 23.574-19.094 42.667-42.666 42.667zM256 426.667c11.733 0 21.334-9.493 21.334-21.333s-9.6-21.334-21.334-21.334-21.334 9.494-21.334 21.334 9.6 21.333 21.334 21.333zM405.334 42.667h-298.666v341.334h42.666v-64h213.334v64h42.666v-341.334z" />
+<glyph unicode="&#xe667;" glyph-name="clipboard" d="M126.448 367.632c0-8.8 0-31.888 0-31.888h224.224c0 0 0 23.088 0 31.888 0 8.816-7.12 15.952-15.936 15.952h-47.84c0 0 0.544 18.208 0.544 46.112 0 25.904-22.464 49.568-49.376 49.568s-47.648-22.496-47.648-49.424c0-25.904-0.192-46.256-0.192-46.256h-47.824c-8.816 0-15.952-7.136-15.952-15.952zM238.064 431.408c8.8 0 15.952-7.136 15.952-15.936 0-8.816-7.152-15.952-15.952-15.952s-15.952 7.136-15.952 15.952c0 8.8 7.152 15.936 15.952 15.936zM382.576 383.584v-158.416c0 0 13.76 15.184 31.872 22.464v151.888c0 17.616-15.28 31.888-32.88 31.888h-78.736v-31.888h63.776c8.816 0 15.968-7.136 15.968-15.936zM205.168-0.096h-94.672c-8.8 0-15.936 7.12-15.936 15.936v367.744c0 8.8 7.136 15.936 15.936 15.936h64.784v31.888h-80.72c-17.616 0-31.888-14.288-31.888-31.888v-399.616c0-17.616 14.272-31.904 31.888-31.904h145.296c-6.24 10.528-17.392 22.688-34.688 31.904zM382.576 15.84c0-8.816-7.152-15.936-15.952-15.936h-43.664c-8.032-10.752-15.6-21.44-22.56-31.904h81.184c17.6 0 32.88 14.288 32.88 31.904v98.064c-10.56-8.688-21.248-18.496-31.872-29.28v-52.848zM449.328 145.184c-17.968 39.936-7.68 72.368-5.12 109.808-105.264-52.4-172.016-209.648-172.016-209.648l-41.072 77.376-84.72-49.904c35.952-12.464 87.296-52.4 130.944-104.816 30.784 54.912 125.776 167.184 171.984 177.184z" />
+<glyph unicode="&#xe668;" glyph-name="screwdriver" d="M438.288 437.376l-58.336-35.488-0.416-32.080-128.768-128.448-17.648 17.648c-6.256 6.256-16.384 6.256-22.64 0-6.24-6.24-12.016-10.592-12.016-10.592l6.56-6.56c-0.064 0.064-0.144 0.128-0.208 0.192-31.808-31.792-52.32-40.992-52.32-40.992l-99.808-101.136c-6.256-6.272-6.256-16.352 0-22.624l56.576-56.576c6.24-6.256 16.368-6.256 22.624 0l99.792 101.136c0 0 9.184 20.48 41.024 52.336l5.664-5.664c0 0 5.040 5.056 11.312 11.312 6.256 6.256 6.256 16.368 0 22.624l-17.152 17.152 128.288 128.912 32.752 0.016 35.248 58.304-30.528 30.528zM63.664 89.568l101.568 101.568 11.312-11.296-101.568-101.584-11.312 11.312zM86.288 66.224l101.568 101.6 11.312-11.344-101.568-101.568-11.312 11.312zM120.224 32.288l-11.312 11.312 101.568 101.584 11.328-11.312-101.584-101.584z" />
+<glyph unicode="&#xe669;" glyph-name="tools" d="M143.274 247.492c8.422-8.406 40.858-42.64 40.858-42.64l17.984 18.546-28.186 29.124 54.107 57.467c0 0-24.421 23.811-13.734 14.327 10.219 37.952 0.906 80.295-27.921 110.122-28.577 29.593-69.185 39.296-105.668 29.109l61.827-63.858-16.265-62.654-60.53-16.719-61.795 63.874c-9.859-37.718-0.485-79.669 28.156-109.278 30.047-31.061 73.311-40.186 111.169-27.421zM349.408 185.385l-74.56-73.654 122.966-127.403c10.031-10.406 23.249-15.594 36.436-15.594 13.125 0 26.312 5.188 36.406 15.594 20.125 20.812 20.125 54.498 0 75.31l-121.247 125.747zM511.841 399.081l-78.31 80.919-230.837-238.649 28.186-29.124-138.167-142.808-31.577-16.875-44.608-72.779 11.36-11.781 70.419 46.123 16.328 32.656 138.168 142.777 28.202-29.124 230.837 238.664z" />
+<glyph unicode="&#xe66a;" glyph-name="wrench" d="M501.467 71.062l-230.276 197.38c10.724 20.149 16.809 43.141 16.809 67.558 0 79.529-64.471 144-144 144-14.547 0-28.586-2.166-41.823-6.177l83.195-83.195c12.445-12.445 12.445-32.81 0-45.255l-50.745-50.745c-12.445-12.445-32.81-12.445-45.255 0l-83.195 83.195c-4.011-13.237-6.177-27.276-6.177-41.823 0-79.529 64.471-144 144-144 24.417 0 47.409 6.085 67.558 16.81l197.38-230.276c11.454-13.362 31.008-14.113 43.452-1.669l50.746 50.746c12.444 12.444 11.693 31.997-1.669 43.451z" />
+<glyph unicode="&#xe66b;" glyph-name="menu2" d="M64 341.333h384v-43h-384v43zM64 192.333v42h384v-42h-384zM64 85.333v43h384v-43h-384z" />
+<glyph unicode="&#xe66c;" glyph-name="support" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM160 224c0 53.020 42.98 96 96 96s96-42.98 96-96-42.98-96-96-96-96 42.98-96 96zM462.99 138.262v0l-88.71 36.745c6.259 15.092 9.72 31.638 9.72 48.993s-3.461 33.901-9.72 48.993l88.71 36.745c10.954-26.411 17.010-55.365 17.010-85.738s-6.057-59.327-17.010-85.738v0zM341.739 430.99v0 0l-36.745-88.71c-15.092 6.259-31.638 9.72-48.994 9.72s-33.901-3.461-48.993-9.72l-36.745 88.711c26.411 10.952 55.366 17.009 85.738 17.009s59.327-6.057 85.739-17.010zM49.010 309.738l88.711-36.745c-6.259-15.092-9.721-31.638-9.721-48.993s3.461-33.901 9.72-48.993l-88.71-36.745c-10.953 26.411-17.010 55.365-17.010 85.738s6.057 59.327 17.010 85.738zM170.262 17.010l36.745 88.71c15.092-6.259 31.638-9.72 48.993-9.72s33.901 3.461 48.993 9.72l36.745-88.71c-26.411-10.952-55.365-17.010-85.738-17.010s-59.327 6.057-85.738 17.010z" />
+<glyph unicode="&#xe66d;" glyph-name="phone2" d="M352 160c-32-32-32-64-64-64s-64 32-96 64-64 64-64 96 32 32 64 64-64 128-96 128-96-96-96-96c0-64 65.75-193.75 128-256s192-128 256-128c0 0 96 64 96 96s-96 128-128 96z" />
+<glyph unicode="&#xe66e;" glyph-name="copy" d="M416 352h-96v32l-96 96h-224v-384h192v-128h320v288l-96 96zM416 306.745l50.745-50.745h-50.745v50.745zM224 434.745l50.745-50.745h-50.745v50.745zM32 448h160v-96h96v-224h-256v320zM480 0h-256v96h96v224h64v-96h96v-224z" />
+<glyph unicode="&#xe66f;" glyph-name="copy2" d="M432 416h-32v-32h16v-256h-128v-128h-192v384h16v32h-32c-8.801 0-16-7.2-16-16v-416c0-8.8 7.199-16 16-16h252l116 116v316c0 8.8-7.2 16-16 16zM320 0v96h96l-96-96zM384 416h-64v32c0 17.6-14.4 32-32 32h-64c-17.602 0-32-14.4-32-32v-32h-64v-64h256v64zM288 416h-64v31.943c0.017 0.019 0.036 0.039 0.057 0.057h63.884c0.021-0.018 0.041-0.038 0.059-0.057v-31.943z" />
+<glyph unicode="&#xe670;" glyph-name="download" d="M368 256l-128-128-128 128h80v192h96v-192zM240 128h-240v-128h480v128h-240zM448 64h-64v32h64v-32z" />
+<glyph unicode="&#xe671;" glyph-name="flow-merge" d="M384 124.075v39.488c0 41.173-33.493 74.667-74.666 74.667-17.642 0-32 14.357-32 32v32.362c24.768 8.854 42.666 32.298 42.666 60.075 0 35.285-28.714 64-64 64s-64-28.714-64-64c0-27.776 17.899-51.221 42.666-60.053v-32.384c0-17.643-14.357-32-32-32-41.173 0-74.666-33.494-74.666-74.667v-39.488c-24.768-8.853-42.666-32.298-42.666-60.075 0-35.286 28.715-64 64-64s64 28.714 64 64c0 27.776-17.898 51.221-42.667 60.075v39.488c0 17.642 14.357 32 32 32 20.886 0 39.766 8.683 53.334 22.571 13.568-13.888 32.448-22.571 53.334-22.571 17.642 0 32-14.358 32-32v-39.488c-24.768-8.853-42.666-32.298-42.666-60.075 0-35.286 28.714-64 64-64s64 28.714 64 64c0 27.776-17.899 51.221-42.666 60.075zM149.333 42.667c-11.776 0-21.334 9.579-21.334 21.334s9.557 21.334 21.334 21.334 21.333-9.579 21.333-21.334-9.558-21.334-21.334-21.334zM256 384c11.776 0 21.334-9.578 21.334-21.333s-9.558-21.333-21.334-21.333-21.334 9.578-21.334 21.333 9.558 21.334 21.334 21.334zM362.666 42.667c-11.776 0-21.334 9.579-21.334 21.334s9.558 21.334 21.334 21.334 21.334-9.579 21.334-21.334-9.558-21.334-21.334-21.334z" />
+<glyph unicode="&#xe672;" glyph-name="flow-switch" d="M170.667 124.075v14.592c0 18.091 10.922 34.026 27.456 43.669-14.23 6.016-27.286 14.229-38.87 24.128-19.286-17.365-31.254-41.344-31.254-67.798v-14.592c-24.768-8.853-42.666-32.298-42.666-60.075 0-35.286 28.715-64 64-64s64 28.714 64 64c0 27.776-17.899 51.221-42.666 60.075zM149.333 42.667c-11.776 0-21.334 9.579-21.334 21.334s9.557 21.334 21.334 21.334 21.333-9.579 21.333-21.334-9.558-21.334-21.334-21.334zM341.334 302.613v-7.488c0-21.013-11.413-39.51-28.694-50.346 14.187-5.845 27.286-13.781 38.89-23.466 19.968 18.731 32.469 44.843 32.469 73.792v7.488c24.768 8.853 42.666 32.298 42.666 60.074 0 35.286-28.714 64-64 64s-64-28.714-64-64c0-27.776 17.899-51.221 42.666-60.053zM362.666 384c11.776 0 21.334-9.578 21.334-21.333s-9.558-21.333-21.334-21.333-21.334 9.578-21.334 21.333 9.558 21.334 21.334 21.334zM382.613 124.501c-8.747 62.144-62.101 110.166-126.613 110.166-41.302 0-75.776 29.461-83.626 68.459 23.893 9.301 40.96 32.405 40.96 59.541 0 35.286-28.714 64-64 64s-64-28.714-64-64c0-28.288 18.56-52.053 44.053-60.501 8.746-62.144 62.101-110.166 126.613-110.166 41.301 0 75.776-29.462 83.626-68.459-23.894-9.301-40.96-32.406-40.96-59.541 0-35.286 28.714-64 64-64s64 28.714 64 64c0 28.288-18.56 52.053-44.053 60.502zM149.333 384c11.776 0 21.333-9.578 21.333-21.333s-9.558-21.333-21.334-21.333-21.334 9.578-21.334 21.333 9.557 21.334 21.334 21.334zM362.666 42.667c-11.776 0-21.334 9.579-21.334 21.334s9.558 21.334 21.334 21.334 21.334-9.579 21.334-21.334-9.558-21.334-21.334-21.334z" />
+<glyph unicode="&#xe673;" glyph-name="mercurial" d="M257.945 449.28c-54.733-6.758-90.010-31.897-106.394-63.027-0.102-0.153-0.205-0.256-0.205-0.409-33.434-55.399-4.403-132.813 83.302-157.696 115.507-32.819 23.859-106.086 26.522-154.88 2.714-48.793 100.454-66.457 177.562 61.645 1.685 2.765 3.277 5.586 4.711 8.448 72.243 126.055-19.353 326.451-185.498 305.92zM249.139 233.523c-25.805 7.629-59.085 18.329-78.336 43.469-14.183 18.586-21.351 38.861-23.194 50.33-0.666 4.096-1.229 7.526-0.051 8.448 0.768 0 10.752-22.477 25.6-41.267 15.053-19.046 36.045-30.208 53.504-34.253 15.565-3.584 47.77-11.52 58.675-20.787 11.207-9.523 12.13-30.157 8.397-32.512-3.84-2.304-11.52 16.743-44.595 26.573zM346.726 149.248c33.382-4.147 69.171 64.973 77.261 107.161 7.885 41.113 11.725-2.662 4.101-30.874-9.113-33.536-40.499-85.35-61.548-109.312-13.209-15.104-27.643-22.989-44.39-27.085h-0.051c-0.205-0.051-0.409-0.108-0.563-0.154-0.256-0.051-0.512-0.103-0.763-0.154-2.714-0.666-5.478-1.224-8.351-1.634-0.558-0.108-1.173-0.205-1.741-0.313l-3.072-0.615c0.409 0.108 0.819 0.205 1.229 0.313-42.087-6.457 5.017 66.709 37.888 62.663zM403.149 99.533c-13.522-17.664-32-30.776-50.279-39.941-13.466-6.753-23.347-8.089-35.072-9.831-9.113-1.331-15.923-0.205-15.416 5.683 0.671 7.783 9.836 2.867 23.194 6.087 47.877 11.627 68.659 35.64 97.28 80.64 22.323 35.077 32.051 73.933 32.768 81.362 2.207-8.955-12.078-71.317-52.475-124.001zM164.557 189.286c-25.651 0-47.872-14.695-58.675-36.096-6.297-10.087-9.933-22.016-9.933-34.765 0-36.301 29.44-65.741 65.741-65.741 25.651 0 47.872 14.695 58.675 36.096 6.298 10.087 9.933 22.016 9.933 34.765 0 36.301-29.44 65.741-65.741 65.741zM170.24 107.161c19.559 6.507 30.106 49.869 32.614 30.515 4.915-38.247-21.351-48.947-29.952-51.2-28.979-7.577-32.307 10.854-2.662 20.685zM170.291 63.334c-4.352-0.409-10.137 1.485-4.762 2.611 6.502 1.331 44.339 11.161 53.248 42.291 2.765 9.728 3.277 7.736 2.458 2.509-3.942-26.88-29.338-46.643-50.944-47.411zM132.25 266.905c-0.256 2.099-0.614 4.199-1.075 6.195-0.051 0.051-0.051 0.102-0.051 0.154-4.813 18.534-21.657 32.256-41.677 32.256-17.049 0-31.846-9.933-38.758-24.371 0 0-0.051-0.051-0.051-0.103-4.455-6.81-7.066-14.899-7.066-23.654 0-23.757 19.251-43.008 43.008-43.008 14.541 0 27.495 7.271 35.225 18.381 5.069 5.632 8.192 13.056 9.626 20.377 0.154 0.717 0.307 1.434 0.41 2.202 0.051 0.102 0.051 0.154 0.051 0.256 0.154 0.819 0.256 1.639 0.307 2.457 0.102 0.768 0.154 1.485 0.205 2.202 0.102 1.536 0.102 3.021 0 4.455-0.051 0.768-0.102 1.485-0.154 2.202zM82.534 255.488c0.768 14.387 23.45 25.395 31.591 12.493 6.605-10.445-6.707-24.166-16.743-26.778-10.65-2.816-15.616-0.051-14.848 14.285zM95.693 223.437c-3.072-0.461-8.499-0.205-5.888 2.15 1.689 1.536 10.343 0.922 18.125 5.12 7.782 4.147 17.049 13.363 18.688 26.419 0.973 7.629 1.28 5.734 1.638 1.536-1.177-21.657-21.145-33.69-32.563-35.226z" />
+<glyph unicode="&#xe674;" glyph-name="git-logo" horiz-adv-x="481" d="M0 46.336q0-32.256 31.744-55.296t76.8-23.040 77.056 23.040 32 55.296q0 32.768-32 55.808t-77.056 23.040q-0.512 0-1.536-0.256t-1.536-0.256q-12.288 11.264-12.288 24.32t12.288 27.392q36.352 2.048 61.44 28.16t25.088 61.952q0 14.336-3.584 25.6 14.336 2.56 22.528 7.168v58.88q-24.576-16.384-55.808-16.384h-3.584q-23.552 15.872-51.712 15.872-38.4 0-65.536-26.624t-27.136-64.512q0-24.064 12.288-44.544t32.768-32.768q-14.336-18.432-14.336-37.888 0-18.432 13.312-38.4-23.552-10.752-37.376-28.16t-13.824-38.4zM61.952 267.52q0 16.896 11.008 28.928t25.856 12.032q15.36 0 26.112-12.032t10.752-28.928-10.752-28.928-26.112-12.032q-14.848 0-25.856 12.032t-11.008 28.928zM63.488 46.336q0 13.824 13.056 23.296t32 9.472 32.256-9.472 13.312-23.296q0-13.312-13.312-23.040t-32.256-9.728-32 9.728-13.056 23.040zM232.96 438.528q0 17.408 12.032 29.44t29.44 12.032 29.696-12.032 12.288-29.44-12.288-29.696-29.696-12.288-29.44 12.288-12.032 29.696zM242.688 107.264v245.248h68.608v-245.248h-68.608zM335.36 300.288h28.16v-145.92q2.048-15.36 9.984-26.368t17.664-16.128 19.2-8.192 15.616-3.584h10.24q13.824 0 24.576 4.096 11.776 4.096 15.36 8.192l3.584 4.608 1.024 50.688q-21.504-6.656-33.28-6.656-2.56 0-4.608 0.512-11.776 1.536-13.824 8.192l-2.048 6.656q0 1.536-0.512 2.048v121.856h46.592v52.224h-46.592v47.616h-62.976v-47.616h-28.16v-52.224z" />
+<glyph unicode="&#xe675;" glyph-name="github" horiz-adv-x="480" d="M0 201.115q0-59.966 17.989-95.695 19.239-37.978 59.715-56.218 40.977-19.239 83.702-23.736 38.478-4.498 82.952-4.498 19.239 0 48.222 1.499 24.236 1.499 51.596 6.621t47.098 13.368q22.487 9.495 41.476 25.61t29.483 37.353q17.49 35.729 17.49 95.695 0 68.461-39.228 114.434 7.745 23.237 7.745 48.722 0 33.731-14.491 62.714-29.733 0-53.094-10.494t-55.343-35.479q-39.228 9.245-80.954 9.245-45.474 0-88.948-9.994-32.731 25.735-56.093 36.229t-53.094 10.494q-14.742-28.733-14.742-62.714 0-25.735 7.745-49.221-39.227-45.974-39.227-113.935zM64.463 150.395q0 35.48 20.364 59.216t53.594 23.737q13.243 0 56.218-6.246 21.988-3.248 45.224-3.248t45.474 3.248q43.725 6.246 56.217 6.246 33.231 0 53.469-23.737t20.238-59.216q0-25.236-9.245-44.474-9.245-18.49-23.111-29.358t-35.355-17.365q-35.48-10.744-83.452-10.744h-48.472q-23.737 0-42.975 2.248-20.488 1.999-41.226 8.745t-34.231 16.99q-14.742 11.493-23.737 30.608t-8.995 43.35zM110.686 150.395q0-11.743 3.748-23.736 3.748-12.993 12.867-22.362t20.363-9.37q11.993 0 20.988 9.745 15.741 18.24 15.741 45.724 0 11.493-3.248 23.486-3.748 12.993-12.868 22.362t-20.613 9.37q-11.993 0-20.988-9.994-15.991-17.24-15.991-45.224zM295.33 150.395q0-11.743 3.748-23.736 3.748-12.993 12.743-22.362t20.238-9.37q12.243 0 21.238 9.745 15.741 18.24 15.741 45.724 0 10.744-3.498 23.486-3.748 12.993-12.868 22.362t-20.613 9.37q-11.993 0-20.488-9.994-16.24-17.24-16.24-45.224z" />
+<glyph unicode="&#xe676;" glyph-name="subversion" horiz-adv-x="707" d="M0 480v-185.333c95.51 39.762 223.101 79.708 383.662 120.060 102.889 25.769 202.353 47.478 298.38 65.273h-682.042zM456.47 391.948c-84.142-21.117-151.889-42.494-203.095-64.276-51.317-21.376-75.13-38.691-71.808-52.019 3.028-11.777 24.514-17.131 64.535-16.023 20.601 0.406 53.976 2.658 100.309 6.756 46.293 4.098 106.105 10.042 179.315 17.758 72.582 7.495 132.683 12.553 180.826 15.506v140.809c-93.106-13.844-176.62-30.126-250.082-48.512zM565.263 186.605c-3.101 12.22-25.179 18.423-65.531 18.755-20.637-0.259-48.992-1.809-85.316-4.504-36.442-2.732-81.517-6.649-135.529-12.257-83.88-8.971-153.694-15.949-209.109-20.49-26.581-2.252-49.656-3.655-69.777-4.762v-150.297c110.055 16.060 209.626 35.257 298.38 57.52 87.202 21.815 154.248 43.154 201.356 63.759 47.142 20.601 69.186 38.101 65.527 52.278zM50.764 120.077c1.145 0.702 2.437 1 3.766 1 1.587-0.077 3.065-0.369 4.245-1.514 2.215-1.809 3.101-5.095 1.993-7.716-0.997-2.769-3.803-4.762-6.756-4.504-2.511 0.074-4.984 1.658-5.981 3.988-1.403 3.024-0.258 7.122 2.732 8.746zM33.523 63.812c-2.991-1.514-6.904-0.554-8.75 2.248-1.92 2.732-1.662 6.834 0.997 9.008 1.292 1.144 2.991 1.769 4.726 1.735 2.991 0.111 5.649-1.993 6.534-4.762 0.886-3.060-0.554-6.9-3.508-8.229zM36.772 111.586c-1.218-2.843-4.431-4.575-7.495-4.024-3.433 0.517-6.055 3.839-5.759 7.273 0.074 3.212 2.806 5.833 5.981 6.24 0.369 0.074 0.665 0 0.997 0 1.846-0.077 3.803-0.627 5.021-1.993 1.883-1.92 2.363-5.021 1.255-7.495zM58.517 64.55c-2.806-2.142-7.236-1.772-9.488 0.997-2.326 2.769-2.178 7.495 0.739 9.747 1.255 1.070 3.101 1.55 4.763 1.514 2.363 0.111 4.467-1.366 5.76-3.249 1.809-2.88 1.071-7.014-1.772-9.008zM346.411 41.55c-133.536-33.486-248.871-57.446-346.411-72.287v-1.255h706.552v184.595c-96.691-37.879-216.748-75.057-360.141-111.053z" />
+<glyph unicode="&#xe677;" glyph-name="jira" horiz-adv-x="382" d="M252.29 141.098c68.022-81.58 62.975-168.284 62.975-168.284h-83.238c6.252 31.563-6.704 77.212-121.196 189.601-114.431 112.397-110.816 189.526-110.816 189.526 0 18.908 16.422 9.039 16.422 9.039 30.358-24.406 74.123-24.481 74.123-24.481 13.333-57.777 89.867-129.414 101.694-140.262 17.627 16.647 86.627 84.519 99.208 139.056 0 0 43.69 0.678 74.123 25.085 0 0 16.421 10.47 16.346-8.437 0 0 3.691-79.547-110.808-191.93-6.629-6.553-12.957-12.806-18.832-18.915zM176.095 51.757c-14.772 19.103-34.47 41.454-60.534 68.082-53.136-76.375-48.873-151.839-48.873-151.839h83.238c-3.691 19.412-0.633 43.969 26.169 83.757v0zM149.075 329.531h82.477c0 0 10.78 1.514 8.15-12.745-3.737-20.293-48.263-61.408-48.263-61.408s-32.549 30.229-47.050 58.62c-0.007 0-5.861 15.532 4.685 15.532v0zM335.671 414.826c0-19.91-16.135-36.045-36.029-36.045-19.909 0-36.045 16.136-36.045 36.045s16.143 36.037 36.044 36.037c19.894 0 36.029-16.128 36.029-36.037v0zM123.41 414.826c0-19.91-16.135-36.045-36.037-36.045s-36.044 16.136-36.044 36.045 16.143 36.037 36.044 36.037 36.037-16.128 36.037-36.037v0zM231.62 443.956c0-19.91-16.136-36.037-36.037-36.037-19.91 0-36.044 16.135-36.044 36.037s16.143 36.045 36.044 36.045c19.902 0 36.037-16.135 36.037-36.045v0z" />
+<glyph unicode="&#xe678;" glyph-name="map-pin-fill" horiz-adv-x="320" d="M273.12 433.12c-62.496 62.496-163.744 62.496-226.256 0-62.496-62.464-62.496-163.808 0-226.24 0.016 0 113.136-110.88 113.136-238.88 0 128 113.12 238.88 113.12 238.88 62.512 62.432 62.512 163.776 0 226.24zM160 256c-35.376 0-64 28.624-64 64s28.624 64 64 64 64-28.624 64-64-28.624-64-64-64z" />
+<glyph unicode="&#xe679;" glyph-name="refresh" d="M136 256c0 70.688 57.312 128 128 128s128-57.312 128-128c0-65.36-62.672-105.52-128-111.216v79.216l-160-112v-16l160-128v80.672c117.552 6.912 224 88.976 224 207.328 0 123.712-100.288 224-224 224s-224-100.288-224-224h96z" />
+<glyph unicode="&#xe67a;" glyph-name="help" d="M360.704 429.235c-29.184 21.043-65.843 31.565-109.978 31.565-33.561 0-61.901-7.399-84.915-22.221-36.531-23.194-55.936-62.592-58.291-118.144h84.659c0 16.205 4.736 31.744 14.157 46.797 9.446 15.002 25.472 22.503 48.077 22.503 22.989 0 38.835-6.093 47.463-18.253 8.678-12.211 13.005-25.702 13.005-40.499 0-12.902-6.451-24.704-14.259-35.405-4.275-6.246-9.907-12.006-16.921-17.255 0 0-45.901-29.44-66.048-53.095-11.673-13.696-12.723-34.253-13.773-63.693-0.051-2.099 0.743-6.451 8.064-6.451 7.347 0 59.289 0 65.817 0 6.553 0 7.911 4.839 7.987 7.014 0.461 10.701 1.639 16.205 3.61 22.4 3.687 11.699 13.773 21.888 25.063 30.695l23.296 16.051c21.043 16.41 37.811 29.85 45.235 40.397 12.647 17.305 21.555 38.656 21.555 64-0.026 41.344-14.618 72.499-43.801 93.593zM249.369 104.345c-29.159 0.896-53.222-19.303-54.144-50.944-0.896-31.591 21.965-52.505 51.149-53.351 30.439-0.896 53.862 18.611 54.809 50.253 0.87 31.642-21.351 53.146-51.815 54.041z" />
+<glyph unicode="&#xe67b;" glyph-name="AWS_Elastic_BeanStalk" d="M475.604 176.523c-5.215 2.575-51.844 25.147-83.42 25.147-5.435 0-10.365-0.666-14.643-1.982-9.026-2.765-18.125-9.348-26.785-17.839v223.905h-205.839v-62.208c-27.977 23.764-97.909 30.2-106.057 30.873l-16.303 1.339 0.483-16.347c0.358-12.135 3.247-73.779 25.073-95.605 18.564-18.564 63.51-23.691 96.805-24.825v-205.151h205.846v39.614c9.428-1.602 19.244-2.743 28.197-2.743 7.973 0 14.643 0.856 20.377 2.611 35.584 10.906 77.451 74.942 82.11 82.205l8.829 13.765-14.673 7.241zM167.782 248.649c0 0-1.968 0.125-5.362 0.417-13.224 1.112-36.082 3.548-57.725 8.184-19.069 2.933-37.383 8.031-46.248 16.896-0.621 0.614-1.17 1.419-1.748 2.136-0.132 0.117-0.285 0.212-0.41 0.329-13.026 12.464-16.157 40.69-16.765 58.844-1.544 13.846-1.873 24.386-1.873 24.386s72.938-5.99 97.829-27.319c5.734-2.933 10.744-6.108 14.365-9.575 18.783-17.964 25.249-65.953 25.512-67.979l0.899-6.861-8.477 0.542zM395.052 87.296c-0.248-0.073-0.563-0.095-0.812-0.161-0.022-0.007-0.044-0.014-0.066-0.022-4.433-1.339-9.904-2.012-16.281-2.012-26.053 0-60.964 11.067-62.435 11.534l-7.212 2.289 3.401 6.685c3.701 7.256 37.003 71.175 66.897 80.194 3.204 0.973 6.956 1.455 11.147 1.455 2.238 0 4.594-0.183 7.007-0.439 29.25-2.128 72.426-23.428 72.426-23.428s-42.599-66.457-74.072-76.098z" />
+<glyph unicode="&#xe67c;" glyph-name="box-remove" d="M416 448h-320l-96-96v-336c0-8.837 7.163-16 16-16h480c8.836 0 16 7.163 16 16v336l-96 96zM320 160v-96h-128v96h-96l160 128 160-128h-96zM77.255 384l32 32h293.488l32-32h-357.488z" />
+<glyph unicode="&#xe67d;" glyph-name="box-add" d="M416 448h-320l-96-96v-336c0-8.837 7.163-16 16-16h480c8.836 0 16 7.163 16 16v336l-96 96zM256 64l-160 128h96v96h128v-96h96l-160-128zM77.255 384l32 32h293.489l32-32h-357.489z" />
+<glyph unicode="&#xe67e;" glyph-name="hipchat" d="M390.729 14.097c-8.572 2.141-26.805 8.255-40.519 13.575s-27.74 10.45-31.169 11.401c-3.428 0.954-29.143 2.735-57.143 3.966-28.6 1.257-57.283 3.612-65.454 5.373-44.583 9.616-91.492 36.245-121.665 69.067-16.256 17.683-26.1 32.128-38.142 55.966l-9.544 18.895v98.166l8.565 17.096c30.628 61.137 77.747 101.127 145.202 123.227 16.131 5.285 20.994 5.863 56.104 6.661 62.429 1.42 89.065-3.005 127.2-21.134 45.44-21.602 81.493-56.018 102.399-97.748 13.626-27.199 18.238-46.564 18.344-77.025 0.151-43.624-10.449-70.658-47.668-121.558-24.927-34.090-28.899-41.139-27.103-48.093 0.695-2.692 9.257-16.058 19.024-29.7 9.768-13.645 17.438-25.774 17.044-26.957-2.039-6.118-33.103-6.777-55.473-1.187v0zM389.856 48.019c0.591 1.536-2.162 11.592-6.117 22.337-3.955 10.748-7.748 21.469-8.43 23.827-0.966 3.346 3.41 9.514 19.899 28.053 36.635 41.185 46.625 56.255 52.949 79.868 6.202 23.161 2.076 81.99-6.991 99.663-6.425 12.523-22.653 33.585-35.754 46.404-23.678 23.171-50.325 38.414-86.82 49.668-17.51 5.399-20.113 5.627-63.967 5.608-40.407-0.016-47.587-0.535-61.844-4.501-49.080-13.631-89.806-42.119-115.936-81.091-14.947-22.293-19-36.882-20.16-72.572-0.889-27.348-0.572-30.748 4.261-45.714 18.219-56.411 68.811-100.233 135.496-117.367 13.821-3.551 25.030-4.426 66.494-5.185l49.87-0.908 20.779-10.342c19.339-9.625 46.387-20.14 52.533-20.422 1.464 0 3.146 1.14 3.737 2.678v0zM210.915 127.978c-28.496 8.452-63.184 31.532-76.364 50.809-13.324 19.488-5.44 19.952 30.379 1.792 38.479-19.51 54.405-23.748 89.621-23.843 40.237 0 65.852 7.063 103.040 28.856 16.618 9.738 23.498 11.35 25.555 5.99 4.585-11.948-32.321-43.743-68.916-59.371-15.928-6.803-16.306-6.854-53.445-7.392-30.927-0.442-39.561 0-49.87 3.158z" />
+<glyph unicode="&#xe67f;" glyph-name="bitbucket" horiz-adv-x="444" d="M0 406.272q0 30.72 65.024 52.224t156.672 21.504q92.16 0 156.928-21.504t64.768-52.224q0-6.144-36.864-225.28-4.608-23.552-56.832-45.568t-128-22.016-128 22.016-56.32 45.568q-37.376 211.968-37.376 225.28zM54.784 108.8v2.048q0 8.704 7.68 8.704 3.072 0 6.144-2.56 24.064-18.944 62.464-29.696t64.512-11.776l26.112-1.536q4.096 0 11.008 0.256t26.88 2.56 38.144 6.4 40.192 12.8 37.376 20.992l5.632 2.56q8.192 0 8.192-8.704 0-1.024-0.512-2.048-11.264-61.952-15.36-82.432-5.632-25.088-49.152-41.728t-102.4-16.64-102.4 16.64-48.64 41.728q-9.728 48.64-15.872 82.432zM79.872 413.952q0-12.288 41.728-21.248t100.096-8.96q58.88 0 100.608 8.704t41.728 20.992q0 12.8-41.728 21.76t-100.608 8.96-100.352-8.704-41.472-21.504zM151.040 233.216q0-29.184 20.736-49.92t49.92-20.736 49.92 20.736 20.736 49.92-20.736 49.92-49.92 20.736-49.92-20.736-20.736-49.92zM186.368 233.216q0-14.336 10.24-24.832t25.088-10.496 25.088 10.496 10.24 24.832-10.24 24.832-25.088 10.496-25.088-10.496-10.24-24.832z" />
+<glyph unicode="&#xe680;" glyph-name="chat-3" d="M138.667 277.333c17.664 0 32-14.315 32-32s-14.336-32-32-32-32 14.315-32 32 14.336 32 32 32zM245.333 277.333c17.664 0 32-14.315 32-32s-14.336-32-32-32-32 14.315-32 32 14.336 32 32 32zM352 277.333c17.664 0 32-14.315 32-32s-14.336-32-32-32-32 14.315-32 32 14.336 32 32 32zM426.666 448h-362.666c-35.285 0-64-28.715-64-64v-256c0-35.286 42.666-42.666 64-42.666v-128l192 128h170.667c35.286 0 64 28.714 64 64v234.667c0 35.286-28.714 64-64 64zM448 149.333c0-11.755-9.579-21.334-21.334-21.334h-192l-128-106.666v106.666h-42.666c-11.755 0-21.334 9.579-21.334 21.334v234.667c0 11.755 9.578 21.334 21.334 21.334h362.666c11.755 0 21.334-9.579 21.334-21.334v-234.667z" />
+<glyph unicode="&#xe681;" glyph-name="checkmark" d="M96 288l-96-96 192-192 320 320-96 96-224-224z" />
+<glyph unicode="&#xe682;" glyph-name="signup" d="M224 82.745l-102.627 118.627 29.254 29.255 73.373-57.372 137.372 121.372 29.256-29.254zM415.886 416c0.039-0.033 0.081-0.075 0.114-0.115v-383.771c-0.033-0.039-0.075-0.081-0.114-0.114h-319.772c-0.040 0.033-0.081 0.075-0.114 0.114v383.772c0.033 0.040 0.075 0.081 0.115 0.114h-64.115v-384c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v384h-64.114zM320 416v32c0 17.673-14.327 32-32 32h-64c-17.673 0-32-14.327-32-32v-32h-64v-64h256v64h-64zM288 416h-64v32h64v-32z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/war/src/main/webapp/css/icons/icomoon/icomoon.ttf b/war/src/main/webapp/css/icons/icomoon/icomoon.ttf
new file mode 100644
index 0000000000..80185a1e56
Binary files /dev/null and b/war/src/main/webapp/css/icons/icomoon/icomoon.ttf differ
diff --git a/war/src/main/webapp/css/icons/icomoon/icomoon.woff b/war/src/main/webapp/css/icons/icomoon/icomoon.woff
new file mode 100644
index 0000000000..23a012792d
Binary files /dev/null and b/war/src/main/webapp/css/icons/icomoon/icomoon.woff differ
diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css
index 601026cef5..db8c6cd26e 100644
--- a/war/src/main/webapp/css/style.css
+++ b/war/src/main/webapp/css/style.css
@@ -88,6 +88,11 @@ body {
   margin-left: 320px;
 }
 
+body#jenkins.j-hide-left #main-panel {
+  max-width:70em;
+  margin:0 auto;
+}
+
 @media (max-width: 750px) {
   #side-panel {
     width: 100%;
@@ -157,8 +162,21 @@ body, table, form, input, td, th, p, textarea, select
 {
   font-family: Helvetica, Arial, sans-serif;
   font-size: 13px;
+  line-height:1.4em;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
+@media (min-width:1600px){
+  body#jenkins.j-hide-left #main-panel{max-width:75%}
+  body, table, form, input, td, th, p, textarea, select, #tasks .task
+    {font-size:14px;}  
+}
+@media (min-width:2000px){
+  body#jenkins.j-hide-left #main-panel{max-width:85%}
+  body, table, form, input, td, th, p, textarea, select, #tasks .task
+    {font-size:15px;}  
+}
 body, table, form, td, th, p
 {
   color: #333;
@@ -355,7 +373,7 @@ pre {/* see http://users.tkk.fi/tkarvine/pre-wrap-css3-mozilla-opera-ie.html */
 }
 
 pre a {
-    word-wrap: break-word;	
+    word-wrap: break-word;  
 }
 
 pre.console {
@@ -567,7 +585,7 @@ div.pane-header {
 }
 
 div.pane-header .collapse {
-	float: right;
+  float: right;
   margin-left: 3px;
 }
 
@@ -703,13 +721,70 @@ table.bigtable.pane > tbody > tr > td:last-child {
 }
 
 div.behavior-loading {
-    position: absolute; width: 80%; height:100%;
+    position: absolute;
+    left:0; right:0;
+    width:100%;
+    height:100%;
     background-color: #e4e4e4; text-align: center; font-size: 300%;
     opacity: 0.5;
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
     filter: alpha(opacity=50);
 }
 
+.config div.behavior-loading{
+    background: rgba(255,255,255,.85);
+    left: 0;
+    width:100%;
+    right: 0;
+    top: 15px;
+    bottom: 0px;
+    height: 100%;
+    width: auto;
+    min-height: 100%;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+    filter: alpha(opacity=100);
+    font-size: 1.5em;
+    z-index: 99;
+    opacity: 1;
+    color: #999;
+    text-shadow:#fff 0 0 5px,#fff 0 0 5px,#fff 0 0 5px,#fff 0 0 5px,#fff 0 0 5px
+}
+
+.behavior-loading:before {
+  content:' ';
+  display:block;
+  width: 100px;
+  height: 100px;
+  margin: 200px auto 25px;
+  background-color: rgba(0,0,0,.15);
+  border:5px solid rgba(0,0,0,.33);
+  position:relative;
+  z-index:2;
+  border-radius: 100%;
+  -webkit-animation: sk-scaleout 1.0s infinite ease-in-out;
+  animation: sk-scaleout 1.0s infinite ease-in-out;
+  box-shaodw:#fff 0 0 0 10px
+}
+
+@-webkit-keyframes sk-scaleout {
+  0% { -webkit-transform: scale(0) }
+  100% {
+    -webkit-transform: scale(1.0);
+    opacity: 0;
+  }
+}
+
+@keyframes sk-scaleout {
+  0% {
+    -webkit-transform: scale(0);
+    transform: scale(0);
+  } 100% {
+    -webkit-transform: scale(1.0);
+    transform: scale(1.0);
+    opacity: 0;
+  }
+}
+
 LABEL.attach-previous {
     margin-left: 0.5em;
 }
@@ -1453,7 +1528,7 @@ DIV.to-be-removed { display: none; }
 
 /* ========================= Yahoo UI style adjustments ========================= */
 .ygtvlabel, .ygtvlabel:link, .ygtvlabel:visited, .ygtvlabel:hover {
-	color: inherit;
+  color: inherit;
 }
 
 DIV.yahooTree td {
@@ -1714,38 +1789,41 @@ table.progress-bar.red td.progress-bar-done {
 
 /* ========================= matrix configuration table ================== */
 table#configuration-matrix {
-	border: 1px #BBBBBB solid;
-	border-collapse: collapse;
+  border: 1px #BBBBBB solid;
+  border-collapse: collapse;
 }
 tr.matrix-row {
-	background: #f0f0f0;
-	font-weight: bold;
+  background: #f0f0f0;
+  font-weight: bold;
 }
 td.matrix-header {
-	border: 1px #BBBBBB solid;
-	padding: 3px;
+  border: 1px #BBBBBB solid;
+  padding: 3px;
 }
 td#matrix-title {
-	padding: 3px;
+  padding: 3px;
 }
 td.matrix-leftcolumn {
-	border: 1px #BBBBBB solid;
-	font-weight: bold;
-	background: #f0f0f0;
-	padding: 3px;
+  border: 1px #BBBBBB solid;
+  font-weight: bold;
+  background: #f0f0f0;
+  padding: 3px;
 }
 td.matrix-cell {
-	border: 1px #BBBBBB solid;
-	text-align: center;
+  border: 1px #BBBBBB solid;
+  text-align: center;
 }
 
 /* ========================= legend.jelly ================== */
 table#legend-table td {
-	vertical-align: middle;
+  vertical-align: middle;
 }
 
 /* ========================= Button styles ================= */
-
+.btn-box {
+  display:block; 
+  margin-top:2em
+}
 #disable-project {
     margin-top: 6px;
 }
@@ -1769,7 +1847,7 @@ table#legend-table td {
     border-style: none;
     border-color: transparent;
 }
-
+#jenkins .yui-button .btn,
 #jenkins .yui-button button {
   font-size: 12px;
   padding: 3px 20px;
@@ -1788,6 +1866,7 @@ table#legend-table td {
     padding-right: 35px;
 }
 
+#jenkins .yui-button .btn:hover,
 #jenkins .yui-button button:hover,
 #jenkins .yui-button .hover
 {
@@ -1795,6 +1874,7 @@ table#legend-table td {
     border: 1px solid #c0c0c0;
 }
 
+#jenkins .yui-button .btn:active,
 #jenkins .yui-button button:active,
 #jenkins .yui-button .active {
     background-color: #bbb;
@@ -1802,6 +1882,7 @@ table#legend-table td {
     border: 1px solid #bbb;
 }
 
+#jenkins .yui-button .btn.disabled,
 #jenkins .yui-button button[disabled],
 #jenkins .yui-button button[disabled]:hover,
 #jenkins .yui-button button[disabled]:active,
@@ -1812,19 +1893,20 @@ table#legend-table td {
 }
 
 /* Color overrides */
+#jenkins .yui-button.primary .btn,
 #jenkins .yui-button.primary button {
     background-color: #4b758b;
     color: #eee;
     border: 1px solid #5788a1;
 }
-
+#jenkins .yui-button.primary .btn:hover,
 #jenkins .yui-button.primary button:hover,
 #jenkins .yui-button.primary .hover
 {
     background-color: #3f6275;
     border: 1px solid #5788a1;
 }
-
+#jenkins .yui-button.primary .btn:active,
 #jenkins .yui-button.primary button:active,
 #jenkins .yui-button.primary .active
 {
@@ -1885,4 +1967,43 @@ table#legend-table td {
     color: #8a6d3b;
     background-color: #fcf8e3;
     border-color: #faebcc;
-}
\ No newline at end of file
+}
+
+body.main-panel-only #side-panel {
+    width: 0 !important;
+    padding: 0 !important;
+    overflow: hidden !important;
+}
+body.main-panel-only #main-panel {
+    margin: 0 auto !important;
+    min-width: 100%;
+    padding: 2em 2em;
+    display: inline-block;
+    width: auto;
+}
+@media screen and (min-width: 1024px) {
+    body.main-panel-only #main-panel {
+        padding: 2em 10%;
+    }
+}
+
+/* see the Icon class for the definition of these CSS classes */
+.icon-sm {
+    width: 16px;
+    height: 16px;
+}
+
+.icon-md {
+    width: 24px;
+    height: 24px;
+}
+
+.icon-lg {
+    width: 32px;
+    height: 32px;
+}
+
+.icon-xlg {
+    width: 48px;
+    height: 48px;
+}
diff --git a/war/src/main/webapp/help/project-config/disable.html b/war/src/main/webapp/help/project-config/disable.html
index 755f4df16e..01e4a48f8e 100644
--- a/war/src/main/webapp/help/project-config/disable.html
+++ b/war/src/main/webapp/help/project-config/disable.html
@@ -1,11 +1,13 @@
 <div>
-  Sometimes you want to temporarily stop building a project. For example,
-  maybe you are in the middle of a large migration and you know new builds are
-  going to fail. Or maybe a project is built every hour but you know that the
-  CVS server will be down for the next 24 hours.
-
+  When this option is checked, no new builds of this project will be executed.
   <p>
-  When this option is set, no new build is performed on this project. This
-  allows you to disable new builds without changing any of the build dependency
-  chain or changing the notification set up.
+  This can be helpful when you want to temporarily prevent a project from being
+  built.  For example, if your project depends on some infrastructure &mdash;
+  e.g. a test server, or a source code repository &mdash; and you know it will
+  be unavailable for a period of time, you could disable the project to prevent
+  unnecessary build failures (and any corresponding notifications) during this
+  period.
+  <p>
+  You can also disable (or re-enable) this project by clicking the <i>Disable
+  Project</i> (or <i>Enable Project</i>) button on this project's main page.
 </div>
diff --git a/war/src/main/webapp/help/project-config/scmCheckoutRetryCount.html b/war/src/main/webapp/help/project-config/scmCheckoutRetryCount.html
index b43f756165..61b457557b 100644
--- a/war/src/main/webapp/help/project-config/scmCheckoutRetryCount.html
+++ b/war/src/main/webapp/help/project-config/scmCheckoutRetryCount.html
@@ -1,4 +1,20 @@
 <div>
-  If a build fails to checkout from the repository, Jenkins will retry the specified number of times before
-  giving up.
-</div>
\ No newline at end of file
+  When this option is checked, and this project is configured to use a Source
+  Code Management system, then Jenkins will try multiple times to check out from
+  the specified SCM system until it succeeds.
+  <p>
+  The default behaviour, or if this value is set to <code>0</code> is to mark
+  a build as failed immediately if checking out from the SCM system fails.
+  <p>
+  Setting this to a higher number means Jenkins will attempt to check out from
+  the SCM system that many times, with a ten-second delay between retries.<br>
+  If the final attempt also fails, then the build will be marked as failed, and
+  execution will stop.
+  <p>
+  As plugins can contribute different Source Code Management implementations,
+  it's up to each individual implementation to define what constitutes a
+  checkout failure.
+  <p>
+  If this option is not checked, then the system-wide default value from the
+  <i>Configure System</i> screen will be used.
+</div>
diff --git a/war/src/main/webapp/help/system-config/homeDirectory.html b/war/src/main/webapp/help/system-config/homeDirectory.html
index f86f59732a..9a6a4e6971 100644
--- a/war/src/main/webapp/help/system-config/homeDirectory.html
+++ b/war/src/main/webapp/help/system-config/homeDirectory.html
@@ -1,17 +1,29 @@
 <div>
-  Jenkins stores all the data files inside this directory in the file system.
-  You can change this by either:
-  <ol>
+  By default, Jenkins stores all of its data in this directory on the file
+  system.
+  <br>
+  Under the <i>Advanced</i> section, you can choose to store build workspaces
+  and build records elsewhere.
+  <p>
+  There are a few ways to change the Jenkins home directory:
+  <ul>
     <li>
-      Using your web container's admin tool to set the <tt>JENKINS_HOME</tt>
-      environment entry.
+      Edit the <code>JENKINS_HOME</code> variable in your Jenkins configuration
+      file (e.g. <code>/etc/sysconfig/jenkins</code> on Red Hat Linux).
     <li>
-      Setting the environment variable <tt>JENKINS_HOME</tt> before launching
-      your web container.
+      Use your web container's admin tool to set the <code>JENKINS_HOME</code>
+      environment variable.
     <li>
-      (Not recommended) modifying web.xml in <tt>jenkins.war</tt> (or its expanded image
-      in your web container).
-  </ol>
+      Set the environment variable <code>JENKINS_HOME</code> before launching
+      your web container, or before launching Jenkins directly from the WAR file.
+    <li>
+      Set the <code>JENKINS_HOME</code> Java system property when launching your
+      web container, or when launching Jenkins directly from the WAR file.
+    <li>
+      Modify <tt>web.xml</tt> in <tt>jenkins.war</tt> (or its expanded image in
+      your web container). This is not recommended.
+  </ul>
   This value cannot be changed while Jenkins is running.
-  This entry is mostly for you to make sure that your configuration is taking effect.
+  <br>
+  It is shown here to help you ensure that your configuration is taking effect.
 </div>
diff --git a/war/src/main/webapp/help/system-config/master-slave/availability.html b/war/src/main/webapp/help/system-config/master-slave/availability.html
index 9048fd30e5..987ca69f27 100644
--- a/war/src/main/webapp/help/system-config/master-slave/availability.html
+++ b/war/src/main/webapp/help/system-config/master-slave/availability.html
@@ -1,46 +1,56 @@
 <div>
-    Controls when Jenkins starts and stops the slave.
+    Controls when Jenkins starts and stops this agent.
 
     <dl>
         <dt><b>
-            Keep this slave on-line as much as possible
+            Keep this agent online as much as possible
         </b></dt>
         <dd>
-            This is the default and normal setting.
-            In this mode, Jenkins uses tries to keep the slave on-line.
-            If Jenkins can start the slave without user assistance, it will periodically
-            attempt to restart the slave if it is unavailable.
-            Jenkins will not take the slave off-line.
+            In this mode, Jenkins will keep this agent online as much as
+            possible.
+            <p>
+            If the agent goes offline, e.g. due to a temporary network failure,
+            Jenkins will periodically attempt to restart it.
         </dd>
 
-        <!--dt><b>
-            Take this slave on-line and off-line at specific times
+        <dt><b>
+            Take this agent online and offline at specific times
         </b></dt>
         <dd>
-            In this mode, Jenkins will keep the slave on-line according to the configured schedule.
-            If Jenkins can start the slave without user assistance, it will periodically
-            attempt to start the slave if it is unavailable during an on-line window.
-
-            During an off-line window, the slave will only be taken off-line if there are no active
-            jobs running on the slave.
-        </dd-->
+            In this mode, Jenkins will bring this agent online at the scheduled
+            time(s), remaining online for a specified amount of time.
+            <p>
+            If the agent goes offline while it is scheduled to be online,
+            Jenkins will periodically attempt to restart it.
+            <p>
+            After this agent has been online for the number of minutes specified
+            in the <i>Scheduled Uptime</i> field, it will be taken offline.
+            <br>
+            If <i>Keep online while builds are running</i> is checked, and the
+            agent is scheduled to be taken offline, Jenkins will wait for any
+            any builds that may be in progress to complete.
+        </dd>
 
         <dt><b>
-            Take this slave on-line when in demand and off-line when idle
+            Take this agent online when in demand, and offline when idle
         </b></dt>
         <dd>
-            In this mode, if Jenkins can launch the slave without user assistance, it will periodically
-            attempt to launch the slave while there are unexecuted jobs which meet the following criteria:
+            In this mode, Jenkins will bring this agent online if there
+            is demand, i.e. there are queued builds which meet the following
+            criteria:
             <ul>
-                <li>They have been in the queue for at least the specified startup demand period</li>
-                <li>They can execute on this slave</li>
+                <li>They have been in the queue for at least the specified <i>In
+                    demand delay</i> time period</li>
+                <li>They can be executed by this agent (e.g. have a matching
+                    label expression)</li>
             </ul>
 
-            The slave will be taken off-line if:
+            This agent will be taken offline if:
             <ul>
-                <li>There are no active jobs running on the slave</li>
-                <li>The slave has been idle for at least the specified idle period</li>
+                <li>There are no active builds running on this agent</li>
+                <li>This agent has been idle for at least the specified <i>Idle
+                    delay</i> time period</li>
             </ul>
         </dd>
     </dl>
-</div>
\ No newline at end of file
+</div>
diff --git a/war/src/main/webapp/help/system-config/master-slave/demand/idleDelay.html b/war/src/main/webapp/help/system-config/master-slave/demand/idleDelay.html
index 77c1070f81..9ab94f6f92 100644
--- a/war/src/main/webapp/help/system-config/master-slave/demand/idleDelay.html
+++ b/war/src/main/webapp/help/system-config/master-slave/demand/idleDelay.html
@@ -1,3 +1,4 @@
 <div>
-    The number of minutes that this slave must remain idle before taking it off-line.
-</div>
\ No newline at end of file
+  The number of minutes that this agent must remain idle before Jenkins will
+  take it offline.
+</div>
diff --git a/war/src/main/webapp/help/system-config/master-slave/demand/inDemandDelay.html b/war/src/main/webapp/help/system-config/master-slave/demand/inDemandDelay.html
index a019c22412..050a49f784 100644
--- a/war/src/main/webapp/help/system-config/master-slave/demand/inDemandDelay.html
+++ b/war/src/main/webapp/help/system-config/master-slave/demand/inDemandDelay.html
@@ -1,4 +1,4 @@
 <div>
-    The number of minutes for which jobs must be waiting in the queue before
-    attempting to launch this slave.
-</div>
\ No newline at end of file
+  The number of minutes for which jobs must have been waiting in the queue
+  before Jenkins will attempt to bring this agent online.
+</div>
diff --git a/war/src/main/webapp/help/system-config/master-slave/demand/keepUpWhenActive.html b/war/src/main/webapp/help/system-config/master-slave/demand/keepUpWhenActive.html
new file mode 100644
index 0000000000..fedb5a8a98
--- /dev/null
+++ b/war/src/main/webapp/help/system-config/master-slave/demand/keepUpWhenActive.html
@@ -0,0 +1,5 @@
+<div>
+  If checked, and this agent is scheduled to be taken offline, but there are
+  builds in progress, Jenkins will wait for those builds to complete before
+  taking this agent offline.
+</div>
diff --git a/war/src/main/webapp/help/system-config/master-slave/description.html b/war/src/main/webapp/help/system-config/master-slave/description.html
index ea5b85eef6..f83a2b4395 100644
--- a/war/src/main/webapp/help/system-config/master-slave/description.html
+++ b/war/src/main/webapp/help/system-config/master-slave/description.html
@@ -1,11 +1,6 @@
 <div>
-  Optional human-readable description of this slave. This information
-  is displayed on the project configuration screen.
-
+  Optional human-readable description for this agent.
   <p>
-  When you have slaves that are different from others, it's often helpful
-  to use this field to explain what is different. For example, entering
-  "Windows slave" in this field would allow project owners to choose to
-  always build on a Windows machine (for example, if they need some
-  Windows-specific build tool.)
-</div>
\ No newline at end of file
+  This could include information useful to users, such as how many CPU cores the
+  agent has, how much RAM it has installed, its physical location, etc.
+</div>
diff --git a/war/src/main/webapp/help/system-config/master-slave/usage.html b/war/src/main/webapp/help/system-config/master-slave/usage.html
index 6180ec7b56..7a82e29015 100644
--- a/war/src/main/webapp/help/system-config/master-slave/usage.html
+++ b/war/src/main/webapp/help/system-config/master-slave/usage.html
@@ -3,27 +3,32 @@
 
   <dl>
     <dt><b>
-      Utilize this node as much as possible
+      Use this node as much as possible
     </b></dt>
     <dd>
-      This is the default and normal setting.
+      This is the default setting.
+      <br>
       In this mode, Jenkins uses this node freely. Whenever there is a build
       that can be done by using this node, Jenkins will use it.
     </dd>
 
     <dt><b>
-      Only build jobs with label restrictions matching this node
+      Only build jobs with label expressions matching this node
     </b></dt>
     <dd>
       In this mode, Jenkins will only build a project on this node when
       that project is restricted to certain nodes using a label expression,
       and that expression matches this node&apos;s name and/or labels.
-
-      This allows a slave to be reserved for certain kinds of jobs.
-      For example, to run performance tests continuously from Jenkins,
-      you can use this setting with # of executors as 1, so that only one performance
-      test runs at any given time, and that one executor won't be blocked
-      by other builds that can be done on other nodes.
+      <p>
+      This allows a node to be reserved for certain kinds of jobs.
+      For example, if you have jobs that run performance tests, you may want
+      them to only run on a specially configured machine, while preventing all
+      other jobs from using that machine. To do so, you would restrict where the
+      test jobs may run by giving them a label expression matching that machine.
+      <br>
+      Furthermore, if you set the <i># of executors</i> value to <tt>1</tt>, you
+      can ensure that only one performance test will execute at any given time
+      on that machine; no other builds will interfere.
     </dd>
   </dl>
-</div>
\ No newline at end of file
+</div>
diff --git a/war/src/main/webapp/help/system-config/nodeEnvironmentVariables.html b/war/src/main/webapp/help/system-config/nodeEnvironmentVariables.html
index cc7cddfa38..2c4abcbedc 100644
--- a/war/src/main/webapp/help/system-config/nodeEnvironmentVariables.html
+++ b/war/src/main/webapp/help/system-config/nodeEnvironmentVariables.html
@@ -1,4 +1,28 @@
 <div>
-    These key-value pairs apply for every build on this node and override any global values. They can be used in Jenkins'
-    configuration (as $key or ${key}) and be will added to the environment for processes launched from the build.
-</div>
\ No newline at end of file
+  Environment variables defined here will be made available to every build
+  executed by this agent, and will override any environment variables that have
+  the same <i>Name</i> as those defined on the <i>Configure System</i> page.
+  <p>
+  Using the syntax <code>$NAME</code> or <code>${NAME}</code>
+  (<code>%NAME%</code> on Windows), these variables can be used in job
+  configurations, or from process launched by a build.
+  <p>
+  Jenkins also supports a special syntax, <code>BASE+EXTRA</code>, which allows
+  you to add multiple key-value pairs here, which will be prepended to an
+  existing environment variable.
+  <p>
+  For example, if you have a machine which has <code>PATH=/usr/bin</code>, you
+  could add to the standard path by defining an environment variable here, with
+  the name <code>PATH+LOCAL_BIN</code> and value <code>/usr/local/bin</code>.
+  <br>
+  This would result in <code>PATH=/usr/local/bin:/usr/bin</code> being exported
+  during builds executed on this machine.
+  <code>PATH+LOCAL_BIN=/usr/local/bin</code> will also be exported.
+  <br>
+  Multiple entries are prepended to the "base" variable according to the
+  alphabetical order of the "extra" part  of the name.
+  <p>
+  If the <i>Value</i> is empty or whitespace-only, it will not be added to the
+  environment, nor will it override or unset any environment variable with the
+  same name that may already exist (e.g. a variable defined by the system).
+</div>
diff --git a/war/src/main/webapp/help/system-config/systemMessage.html b/war/src/main/webapp/help/system-config/systemMessage.html
index 68ec261681..492e75c01c 100644
--- a/war/src/main/webapp/help/system-config/systemMessage.html
+++ b/war/src/main/webapp/help/system-config/systemMessage.html
@@ -1,5 +1,6 @@
 <div>
-  This message will be displayed on <a href=".">the top page</a>.
-  Useful for posting a system-wide notification to users.
-  Can contain HTML tags or whatever markup language is defined for the system.
+  This message will be displayed at the top of the
+  <a href="." target="_blank">Jenkins main page</a>.
+  <p>
+  This can be useful for posting notifications to your users.
 </div>
diff --git a/war/src/main/webapp/images/48x48/copy.png b/war/src/main/webapp/images/48x48/copy.png
new file mode 100644
index 0000000000..9033470962
Binary files /dev/null and b/war/src/main/webapp/images/48x48/copy.png differ
diff --git a/war/src/main/webapp/images/48x48/freestyleproject.png b/war/src/main/webapp/images/48x48/freestyleproject.png
new file mode 100644
index 0000000000..383a76f01c
Binary files /dev/null and b/war/src/main/webapp/images/48x48/freestyleproject.png differ
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index b0cf9e368c..1b89841a45 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1195,6 +1195,7 @@ var jenkinsRules = {
         Element.observe(window,"resize",adjustSticker);
         // initial positioning
         Element.observe(window,"load",adjustSticker);
+        Event.observe(window, 'jenkins:bottom-sticker-adjust', adjustSticker);
         adjustSticker();
         layoutUpdateCallback.add(adjustSticker);
     },
diff --git a/war/src/test/js/pluginSetupWizard-spec.js b/war/src/test/js/pluginSetupWizard-spec.js
new file mode 100644
index 0000000000..2674db2593
--- /dev/null
+++ b/war/src/test/js/pluginSetupWizard-spec.js
@@ -0,0 +1,367 @@
+var jsTest = require("jenkins-js-test");
+var jquery = require('jquery-detached');
+
+var debug = false;
+
+var getJQuery = function() {
+    var $ = jquery.getJQuery();
+    $.fx.off = true;
+    return $;
+};
+
+var pluginList = jsTest.requireSrcModule('api/plugins');
+
+pluginList.recommendedPlugins = ['subversion'];
+
+// Iterates through all responses until the end and returns the last response repeatedly
+var LastResponse = function(responses) {
+    var counter = 0;
+    this.next = function() {
+        if(counter < responses.length) {
+            try {
+                return responses[counter];
+            } finally {
+                counter++;
+            }
+        }
+        if(responses.length > 0) {
+            return responses[counter-1];
+        }
+        return { status: 'fail' };
+    };
+};
+
+// common mocks for jQuery $.ajax
+var ajaxMocks = function(responseMappings) {
+    var defaultMappings = {
+        '/jenkins/i18n/resourceBundle?baseName=jenkins.install.pluginSetupWizard': {
+            status: 'ok',
+            data: {
+                'installWizard_offline_title': 'Offline',
+                'installWizard_error_header': 'Error',
+                'installWizard_installIncomplete_title': 'Resume Installation'
+            }
+        },
+        '/jenkins/updateCenter/incompleteInstallStatus': {
+            status: 'ok',
+            data: []
+        },
+        '/jenkins/updateCenter/installStatus': new LastResponse([{
+            status: 'ok',
+            data: { // first, return nothing by default, no ongoing install
+            	state: 'NEW',
+            	jobs: []
+        	}
+        },
+        {
+            status: 'ok',
+            data: {
+            	state: 'INSTALLING_PLUGINS',
+            	jobs: [
+	              {
+	                  name: 'subversion',
+	                  type: 'InstallJob',
+	                  installStatus: 'Success'
+	              }
+	            ]
+            }
+        }]),
+        '/jenkins/pluginManager/plugins': {
+            status: 'ok',
+            data: [
+                {
+                    name: 'junit',
+                    title: 'JUnit plugin',
+                    dependencies: {}
+                },
+                {
+                    name: 'subversion',
+                    title: 'Subversion plugin'
+                },
+                {
+                    name: 'other',
+                    title: 'Other thing',
+                    dependencies: { 'subversion': '1' }
+                },
+                {
+                    name: 'mailer',
+                    title: 'Mailer plugin',
+                    dependencies: { 'other': '1' }
+                }
+            ]
+        },
+        '/jenkins/updateCenter/connectionStatus?siteId=default': {
+            status: 'ok',
+            data: {
+                updatesite: 'OK',
+                internet: 'OK'
+            }
+        },
+        '/jenkins/pluginManager/installPlugins': {
+        status: 'ok',
+        data: 'RANDOM_UUID_1234'
+        }
+    };
+
+    if (!responseMappings) {
+        responseMappings = {};
+    }
+
+    return function(call) {
+        if(debug) {
+            console.log('AJAX call: ' + call.url);
+        }
+
+        var response = responseMappings[call.url];
+        if (!response) {
+            response = defaultMappings[call.url];
+        }
+        if (!response) {
+            throw 'No data mapping provided for AJAX call: ' + call.url;
+        }
+        if(response instanceof LastResponse) {
+        response = response.next();
+        }
+        call.success(response);
+    };
+};
+
+// call this for each test, it will provide a new wizard, jquery to the caller
+var test = function(test, ajaxMappings) {
+    jsTest.onPage(function() {
+        // deps
+        var $ = getJQuery();
+
+        // Respond to status request
+        $.ajax = ajaxMocks(ajaxMappings);
+
+        // load the module
+        var pluginSetupWizard = jsTest.requireSrcModule('pluginSetupWizardGui');
+
+        // exported init
+        pluginSetupWizard.init('body');
+
+        test($, pluginSetupWizard);
+    });
+};
+
+// helper to validate the appropriate plugins were installed
+var validatePlugins = function(plugins, complete) {
+    var jenkins = jsTest.requireSrcModule('util/jenkins');
+    if(!jenkins.originalPost) {
+    jenkins.originalPost = jenkins.post;
+    }
+    jenkins.post = function(url, data, cb) {
+        expect(url).toBe('/pluginManager/installPlugins');
+        var allMatch = true;
+        for(var i = 0; i < plugins.length; i++) {
+        if(data.plugins.indexOf(plugins[i]) < 0) {
+            allMatch = false;
+            break;
+        }
+        }
+        if(!allMatch) {
+            expect(JSON.stringify(plugins)).toBe('In: ' + JSON.stringify(data.plugins));
+        }
+        // return status
+        cb({status:'ok',data:{correlationId:1}});
+        if(complete) {
+        complete();
+        }
+    };
+};
+
+describe("pluginSetupWizard.js", function () {
+    it("wizard shows", function (done) {
+        test(function($) {
+            // Make sure the dialog was shown
+            var $wizard = $('.plugin-setup-wizard');
+            expect($wizard.size()).toBe(1);
+
+            done();
+        });
+    });
+
+    it("offline shows", function (done) {
+        jsTest.onPage(function() {
+            // deps
+            var jenkins = jsTest.requireSrcModule('./util/jenkins');
+
+            var $ = getJQuery();
+            $.ajax = ajaxMocks();
+
+            var get = jenkins.get;
+            try {
+                // Respond with failure
+            jenkins.get = function(url, cb) {
+                if (debug) {
+                        console.log('Jenkins.GET: ' + url);
+                    }
+
+                if(url === '/updateCenter/connectionStatus?siteId=default') {
+                    cb({
+                        status: 'ok',
+                        data: {
+                            updatesite: 'ERROR',
+                            internet: 'ERROR'
+                        }
+                    });
+                }
+                else {
+                    get(url, cb);
+                }
+                };
+
+                // load the module
+                var pluginSetupWizard = jsTest.requireSrcModule('pluginSetupWizardGui');
+
+                // exported init
+                pluginSetupWizard.init('body');
+
+                expect($('.welcome-panel h1').text()).toBe('Offline');
+
+            done();
+            } finally {
+            jenkins.get = get;
+            }
+        });
+    });
+
+    it("install defaults", function (done) {
+        test(function($) {
+            // Make sure the dialog was shown
+            var wizard = $('.plugin-setup-wizard');
+            expect(wizard.size()).toBe(1);
+
+            var goButton = $('.install-recommended');
+            expect(goButton.size()).toBe(1);
+
+            // validate a call to installPlugins with our defaults
+            validatePlugins(['subversion'], function() {
+                done();
+            });
+
+            goButton.click();
+        });
+    });
+
+    var doit = function($, sel, trigger) {
+    var $el = $(sel);
+    if($el.length !== 1) {
+        console.log('Not found! ' + sel);
+            console.log(new Error().stack);
+    }
+    if(trigger === 'check') {
+        $el.prop('checked', true);
+        trigger = 'change';
+    }
+    $el.trigger(trigger);
+    };
+
+    it("install custom", function (done) {
+        test(function($) {
+            $('.install-custom').click();
+
+            // validate a call to installPlugins with our defaults
+            validatePlugins(['junit','mailer'], function() {
+                // install a specific, other 'set' of plugins
+                $('input[name=searchbox]').val('junit');
+
+                done();
+            });
+
+            doit($, 'input[name=searchbox]', 'blur');
+
+            doit($, '.plugin-select-none', 'click');
+
+            doit($, 'input[name="junit"]', 'check');
+            doit($, 'input[name="mailer"]', 'check');
+
+            doit($, '.install-selected', 'click');
+        });
+    });
+
+    it("resume install", function (done) {
+        var ajaxMappings = {
+        '/jenkins/updateCenter/incompleteInstallStatus': {
+                status: 'ok',
+                data: {
+                    'junit': 'Success',
+                    'subversion': 'Pending',
+                    'mailer': 'Success',
+                    'other': 'Failed'
+                }
+            }
+        };
+        test(function($) {
+        expect($('.modal-title').text()).toBe('Resume Installation');
+        expect($('*[data-name="junit"]').is('.success')).toBe(true);
+        done();
+        }, ajaxMappings);
+    });
+
+    it("error conditions", function (done) {
+        var ajaxMappings = {
+        '/jenkins/updateCenter/incompleteInstallStatus': {
+                status: 'error',
+                data: {
+            'junit': 'Success',
+            'subversion': 'Pending',
+            'other': 'Failed',
+            'mailer': 'Success'
+                }
+            }
+        };
+        test(function($) {
+        expect($('.error-container h1').html()).toBe('Error');
+        done();
+        }, ajaxMappings);
+    });
+
+    it("restart required", function (done) {
+        var jenkins = jsTest.requireSrcModule('util/jenkins');
+        if(jenkins.originalPost) {
+            jenkins.post = jenkins.originalPost;
+        }
+
+        var ajaxMappings = {
+            '/jenkins/updateCenter/installStatus': new LastResponse([{
+                status: 'ok',
+                data: { // first, return nothing by default, no ongoing install
+                    state: 'NEW',
+                    jobs: []
+                }
+            },
+            {
+                status: 'ok',
+                data: {
+                    state: 'INSTALLING_PLUGINS',
+                    jobs: [
+                      {
+                          name: 'subversion',
+                          type: 'InstallJob',
+                          installStatus: 'Success',
+                          requiresRestart: 'true' // a string...
+                      }
+                  ]
+                }
+            }])
+        };
+        test(function($) {
+            var goButton = $('.install-recommended');
+            expect(goButton.size()).toBe(1);
+
+            // validate a call to installPlugins with our defaults
+        setTimeout(function() {
+                expect($('.install-done').is(':visible')).toBe(false);
+
+                expect($('.save-first-user').is(':visible')).toBe(true);
+
+                done();
+        }, 500);
+
+            goButton.click();
+        }, ajaxMappings);
+    });
+
+});
\ No newline at end of file
diff --git a/war/src/test/js/widgets/config/freestyle-config-scrollspy.html b/war/src/test/js/widgets/config/freestyle-config-scrollspy.html
new file mode 100644
index 0000000000..1f3a6be104
--- /dev/null
+++ b/war/src/test/js/widgets/config/freestyle-config-scrollspy.html
@@ -0,0 +1,169 @@
+<div>
+    <div id="page-head" style="height: 66px;"> <!-- explicitly setting the heights because jsdom doesn't calculate them -->
+        <div id="header" style="height: 40px;"></div>
+        <div id="breadcrumbBar" style="height: 26px;"></div>
+    </div>
+    <form name="config" action="configSubmit" method="post" class="jenkins-config">
+        <table width="100%" class="config-table scrollspy">
+            <tbody>
+            <tr>
+                <td class="setting-name">Project name</td>
+                <td class="setting-main">
+
+
+                    <input name="name" value="Free-2" class="setting-input   " type="text"></td>
+            </tr>
+            <tr nameref="rowSetStart24">
+                <td><input type="hidden" name="stapler-class-bag" value="true"></td>
+            </tr>
+
+            <!-- Purposely indenting so as to highlight the implicit data "model" around row groupings -->
+            <tr style="display:none" class="row-set-start row-group-start" nameref="rowSetStart24"></tr>
+            <tr class="optional-block-start row-group-start " hashelp="true" ref="cb9" nameref="rowSetStart22">
+                <td colspan="3">
+                    <input name="specified" class="optional-block-control block-control  " type="checkbox">
+                    <label class="attach-previous">Discard Old Builds</label>
+                </td>
+            </tr>
+            <tr class="help-area" nameref="rowSetStart22">
+                <td></td>
+                <td colspan="2">
+                    <div class="help">Loading...</div>
+                </td>
+                <td></td>
+            </tr>
+            <tr class="rowvg-start" nameref="rowSetStart22" style="display: none;"></tr>
+            <tr nameref="rowSetStart22" style="display: none;"><td class="setting-name">Strategy</td><td class="setting-main"></td></tr>
+            <tr class="dropdownList-container" nameref="rowSetStart22" style="display: none;"><td colspan="2"></td></tr>
+            <tr class=" rowvg-end optional-block-end row-group-end" nameref="rowSetStart22"></tr>
+            <tr class="row-set-end row-group-end" nameref="rowSetStart24"></tr>
+
+            <tr>
+                <td colspan="4">
+                    <div class="section-header"><a id="section0" class="section-anchor">#</a>Advanced Project Options</div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <script src="/jenkins/adjuncts/5a08e6fd/lib/form/advanced/advanced.js" type="text/javascript"></script>
+                    <div style="" class="advancedLink">
+                    <span class="yui-button yui-push-button advanced-button advancedButton" id="yui-gen9">
+                        <span class="first-child">
+                            <button type="button" tabindex="0" id="yui-gen9-button">Advanced...</button>
+                        </span>
+                    </span>
+                    </div>
+                    <table class="advancedBody">
+                        <tbody>
+                        <tr class="optional-block-start row-group-start " hashelp="true" ref="cb13">
+                            <td colspan="3">
+                                <input class="optional-block-control block-control  "type="checkbox"checked="true">
+                                <label class="attach-previous">Quiet period</label>
+                            </td>
+                        </tr>
+                        <tr class="rowvg-start"></tr>
+                        <tr>
+                            <td class="setting-name">Quiet period</td>
+                            <td class="setting-main"></td>
+                        </tr>
+                        <tr>
+                            <td colspan="2"></td>
+                            <td class="setting-description">Number of seconds</td>
+                        </tr>
+                        <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                        <tr class="optional-block-start row-group-start " hashelp="true" ref="cb14">
+                            <td colspan="3"><input class="optional-block-control block-control  "
+                                                   type="checkbox" id="cb14"><label class="attach-previous">Retry Count</label></td>
+                        </tr>
+                        <tr class="rowvg-start" style="display: none;"></tr>
+                        <tr style="display: none;">
+                            <td class="setting-name">SCM checkout retry count</td>
+                            <td class="setting-main"><input min="0" step="1" value="0"
+                                                            class="setting-input  number" type="number"></td>
+                        </tr>
+                        <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                        <tr class="optional-block-start row-group-start " hashelp="true" ref="cb15">
+                            <td colspan="3">
+                                <input class="optional-block-control block-control  " type="checkbox">
+                                <label class="attach-previous">Block build when upstream project is building</label>
+                            </td>
+                        </tr>
+                        <tr class="rowvg-start" style="display: none;"></tr>
+                        <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                        <tr class="optional-block-start row-group-start " hashelp="true" ref="cb16">
+                            <td colspan="3"><input class="optional-block-control block-control  " type="checkbox">
+                                <label class="attach-previous">Block build when downstream project is building</label>
+                            </td>
+                        </tr>
+                        <tr class="rowvg-start" style="display: none;"></tr>
+                        <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                        <tr class="optional-block-start row-group-start " hashelp="true" ref="cb17">
+                            <td colspan="3">
+                                <input class="optional-block-control block-control  " type="checkbox">
+                                <label class="attach-previous">Use custom workspace</label>
+                            </td>
+                        </tr>
+                        <tr class="rowvg-start" style="display: none;"></tr>
+                        <tr style="display: none;">
+                            <td class="setting-name">Directory</td>
+                            <td class="setting-main"></td>
+                        </tr>
+                        <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                        <tr>
+                            <td class="setting-name">Display Name</td>
+                            <td class="setting-main"></td>
+                        </tr>
+                        <tr class="optional-block-start row-group-start row-set-start">
+                            <td colspan="3">
+                                <input class="optional-block-control block-control  " type="checkbox">
+                                <label class="attach-previous">Keep the build logs of dependencies</label></td>
+                        </tr>
+                        <tr class="rowvg-start" nameref="cb18" style="display: none;"></tr>
+                        <tr class="row-set-end rowvg-end optional-block-end row-group-end"></tr>
+                        </tbody>
+                    </table>
+                </td>
+                <td></td>
+            </tr>
+            <tr style="display:none" class="row-set-end radio-block-end row-group-end"></tr>
+            <tr>
+                <td colspan="4">
+                    <div class="section-header"><a id="section2" class="section-anchor">#</a>Build Triggers</div>
+                </td>
+            </tr>
+            <tr class="optional-block-start row-group-start row-set-start" hashelp="true" ref="cb19">
+                <td colspan="3">
+                    <input class="optional-block-control block-control  "type="checkbox">
+                    <!-- We added the text "Trigger" here for testing the finder -->
+                    <label class="attach-previous">Build (Trigger) after other projects are built</label>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4">
+                    <div class="section-header"><a id="section3" class="section-anchor">#</a>Build</div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4">
+                    <div style="height: 74px;"></div>
+                    <div id="bottom-sticker" style="position: fixed; bottom: 83px; left: 378px;">
+                        <div class="bottom-sticker-edge"></div>
+                        <div class="bottom-sticker-inner"><span
+                                class="yui-button yui-submit-button submit-button primary"
+                                id="yui-gen17" name="Submit"><span class="first-child"><button
+                                type="button" tabindex="0" id="yui-gen17-button">Save All
+                        </button></span></span>
+                            <script src="/jenkins/adjuncts/5a08e6fd/lib/form/apply/apply.js"
+                                    type="text/javascript"></script>
+                            <input type="hidden" name="core:apply" value=""><span
+                                    class="yui-button yui-push-button apply-button applyButton"
+                                    id="yui-gen11" name="Apply"><span class="first-child"><button
+                                    type="button" tabindex="0" id="yui-gen11-button">Apply All
+                            </button></span></span></div>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
diff --git a/war/src/test/js/widgets/config/freestyle-config-tabbed.html b/war/src/test/js/widgets/config/freestyle-config-tabbed.html
new file mode 100644
index 0000000000..523bc8e1a5
--- /dev/null
+++ b/war/src/test/js/widgets/config/freestyle-config-tabbed.html
@@ -0,0 +1,163 @@
+<form name="config" action="configSubmit" method="post" class="jenkins-config">
+    <table width="100%" class="config-table tabbed">
+        <tbody>
+        <tr>
+            <td class="setting-name">Project name</td>
+            <td class="setting-main">
+
+
+                <input name="name" value="Free-2" class="setting-input   " type="text"></td>
+        </tr>
+        <tr nameref="rowSetStart24">
+            <td><input type="hidden" name="stapler-class-bag" value="true"></td>
+        </tr>
+
+        <!-- Purposely indenting so as to highlight the implicit data "model" around row groupings -->
+        <tr style="display:none" class="row-set-start row-group-start" nameref="rowSetStart24"></tr>
+            <tr class="optional-block-start row-group-start " hashelp="true" ref="cb9" nameref="rowSetStart22">
+                <td colspan="3">
+                    <input name="specified" class="optional-block-control block-control  " type="checkbox">
+                    <label class="attach-previous">Discard Old Builds</label>
+                </td>
+            </tr>
+                <tr class="help-area" nameref="rowSetStart22">
+                    <td></td>
+                    <td colspan="2">
+                        <div class="help">Loading...</div>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr class="rowvg-start" nameref="rowSetStart22" style="display: none;"></tr>
+                <tr nameref="rowSetStart22" style="display: none;"><td class="setting-name">Strategy</td><td class="setting-main"></td></tr>
+                <tr class="dropdownList-container" nameref="rowSetStart22" style="display: none;"><td colspan="2"></td></tr>
+        <tr class=" rowvg-end optional-block-end row-group-end" nameref="rowSetStart22"></tr>
+        <tr class="row-set-end row-group-end" nameref="rowSetStart24"></tr>
+
+        <tr>
+            <td colspan="4">
+                <div class="section-header"><a id="section0" class="section-anchor">#</a>Advanced Project Options</div>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <script src="/jenkins/adjuncts/5a08e6fd/lib/form/advanced/advanced.js" type="text/javascript"></script>
+                <div style="" class="advancedLink">
+                    <span class="yui-button yui-push-button advanced-button advancedButton" id="yui-gen9">
+                        <span class="first-child">
+                            <button type="button" tabindex="0" id="yui-gen9-button">Advanced...</button>
+                        </span>
+                    </span>
+                </div>
+                <table class="advancedBody">
+                    <tbody>
+                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb13">
+                        <td colspan="3">
+                            <input class="optional-block-control block-control  "type="checkbox"checked="true">
+                            <label class="attach-previous">Quiet period</label>
+                        </td>
+                    </tr>
+                    <tr class="rowvg-start"></tr>
+                    <tr>
+                        <td class="setting-name">Quiet period</td>
+                        <td class="setting-main"></td>
+                    </tr>
+                    <tr>
+                        <td colspan="2"></td>
+                        <td class="setting-description">Number of seconds</td>
+                    </tr>
+                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb14">
+                        <td colspan="3"><input class="optional-block-control block-control  "
+                                               type="checkbox" id="cb14"><label class="attach-previous">Retry Count</label></td>
+                    </tr>
+                    <tr class="rowvg-start" style="display: none;"></tr>
+                    <tr style="display: none;">
+                        <td class="setting-name">SCM checkout retry count</td>
+                        <td class="setting-main"><input min="0" step="1" value="0"
+                                                        class="setting-input  number" type="number"></td>
+                    </tr>
+                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb15">
+                        <td colspan="3">
+                            <input class="optional-block-control block-control  " type="checkbox">
+                            <label class="attach-previous">Block build when upstream project is building</label>
+                        </td>
+                    </tr>
+                    <tr class="rowvg-start" style="display: none;"></tr>
+                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb16">
+                        <td colspan="3"><input class="optional-block-control block-control  " type="checkbox">
+                            <label class="attach-previous">Block build when downstream project is building</label>
+                        </td>
+                    </tr>
+                    <tr class="rowvg-start" style="display: none;"></tr>
+                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb17">
+                        <td colspan="3">
+                            <input class="optional-block-control block-control  " type="checkbox">
+                            <label class="attach-previous">Use custom workspace</label>
+                        </td>
+                    </tr>
+                    <tr class="rowvg-start" style="display: none;"></tr>
+                    <tr style="display: none;">
+                        <td class="setting-name">Directory</td>
+                        <td class="setting-main"></td>
+                    </tr>
+                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
+                    <tr>
+                        <td class="setting-name">Display Name</td>
+                        <td class="setting-main"></td>
+                    </tr>
+                    <tr class="optional-block-start row-group-start row-set-start">
+                        <td colspan="3">
+                            <input class="optional-block-control block-control  " type="checkbox">
+                            <label class="attach-previous">Keep the build logs of dependencies</label></td>
+                    </tr>
+                    <tr class="rowvg-start" nameref="cb18" style="display: none;"></tr>
+                    <tr class="row-set-end rowvg-end optional-block-end row-group-end"></tr>
+                    </tbody>
+                </table>
+            </td>
+            <td></td>
+        </tr>
+        <tr style="display:none" class="row-set-end radio-block-end row-group-end"></tr>
+        <tr>
+            <td colspan="4">
+                <div class="section-header"><a id="section2" class="section-anchor">#</a>Build Triggers</div>
+            </td>
+        </tr>
+        <tr class="optional-block-start row-group-start row-set-start" hashelp="true" ref="cb19">
+            <td colspan="3">
+                <input class="optional-block-control block-control  "type="checkbox">
+                <!-- We added the text "Trigger" here for testing the finder -->
+                <label class="attach-previous">Build (Trigger) after other projects are built</label>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="4">
+                <div class="section-header"><a id="section3" class="section-anchor">#</a>Build</div>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="4">
+                <div style="height: 74px;"></div>
+                <div id="bottom-sticker" style="position: fixed; bottom: 83px; left: 378px;">
+                    <div class="bottom-sticker-edge"></div>
+                    <div class="bottom-sticker-inner"><span
+                            class="yui-button yui-submit-button submit-button primary"
+                            id="yui-gen17" name="Submit"><span class="first-child"><button
+                            type="button" tabindex="0" id="yui-gen17-button">Save All
+                    </button></span></span>
+                        <script src="/jenkins/adjuncts/5a08e6fd/lib/form/apply/apply.js"
+                                type="text/javascript"></script>
+                        <input type="hidden" name="core:apply" value=""><span
+                                class="yui-button yui-push-button apply-button applyButton"
+                                id="yui-gen11" name="Apply"><span class="first-child"><button
+                                type="button" tabindex="0" id="yui-gen11-button">Apply All
+                        </button></span></span></div>
+                </div>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</form>
\ No newline at end of file
diff --git a/war/src/test/js/widgets/config/mocks.js b/war/src/test/js/widgets/config/mocks.js
new file mode 100644
index 0000000000..d43c774af3
--- /dev/null
+++ b/war/src/test/js/widgets/config/mocks.js
@@ -0,0 +1,17 @@
+var jsTest = require("jenkins-js-test");
+
+// mock the behaviors stuff.
+var behaviorShim = jsTest.requireSrcModule('util/behavior-shim');
+behaviorShim.specify = function(selector, id, priority, behavior) {
+    behavior();
+};
+
+// Mock out the fireBottomStickerAdjustEvent function ... it accesses Event.
+var page = jsTest.requireSrcModule('util/page');
+page.fireBottomStickerAdjustEvent = function() {};
+
+var windowHandle = require('window-handle');
+windowHandle.getWindow(function() {
+    var localStorage = jsTest.requireSrcModule('util/localStorage');
+    localStorage.setMock();
+});
diff --git a/war/src/test/js/widgets/config/scrollspy-spec.js b/war/src/test/js/widgets/config/scrollspy-spec.js
new file mode 100644
index 0000000000..e072ee34be
--- /dev/null
+++ b/war/src/test/js/widgets/config/scrollspy-spec.js
@@ -0,0 +1,117 @@
+var jsTest = require("jenkins-js-test");
+
+require('./mocks');
+
+describe("scrollspy-spec tests", function () {
+
+    it("- test scrolling", function (done) {
+        jsTest.onPage(function () {
+            var manualScroller = newManualScroller();
+            var tabbars = jsTest.requireSrcModule('config-scrollspy.js');
+            tabbars.scrollspeed = 1; // speed up the scroll speed for testing
+
+            var tabbar = tabbars.tabbars[0];
+
+            // We need to trick it into thinking that the sections have
+            // some height. We need height if we want to scroll.
+            doSectionFunctionMocking(tabbar);
+
+            // console.log('**** ' + tabbar.sectionIds());
+            // **** config_general,config__advanced_project_options,config__build_triggers,config__build
+
+            var scrollToLog = [];
+            var click_scrollto_done = false;
+            var manual_scrollto_done = true;
+            tabbars.on(function (event) {
+                if (event.type === 'manual_scrollto') {
+                    manual_scrollto_done = true;
+                }
+                if (event.type === 'click_scrollto') {
+                    expect(event.section.id).toBe('config__build');
+                    click_scrollto_done = true;
+                }
+                scrollToLog.push(event.section.id);
+
+                if (click_scrollto_done && manual_scrollto_done) {
+                    var scrollEvents = JSON.stringify(scrollToLog);
+                    // see the calls to manualScroller.scrollTo (below)
+                    if (scrollEvents === '["config_general","config__advanced_project_options","config__build_triggers","config_general","config__build"]') {
+                        done();
+                    }
+                }
+            });
+
+            // Lets mimic scrolling. This should trigger the
+            // scrollspy into activating different sections
+            // as the user scrolls down the page.
+            // See the test console output (gulp test) for a printout
+            // of the positions/offsets of each section.
+            // i.e. ...
+            //	    config_general: 100
+            //	    config__advanced_project_options: 140
+            //	    config__build_triggers: 180
+            //	    config__build: 220
+
+            manualScroller.scrollTo(100);
+            manualScroller.scrollTo(140);
+            manualScroller.scrollTo(180);
+
+            // Scrolling to the last section offset will not trigger its
+            // tab into being activated. Search for "### < 75% ADVANCED"
+            // in config-scrollspy.js
+            // So, "config__build" should not be added to 'scrollToLog' (see above).
+            // But, a manual click on the tab (vs a scroll) should result in it
+            // being added later.
+            manualScroller.scrollTo(220); // This will not trigger a
+
+            // Scroll back to the General section ... that should work and log
+            // to 'scrollToLog' (see above).
+            manualScroller.scrollTo(100);
+
+            // Now, manually activate the the "General" section i.e. "activate" it.
+            // This should result in 'config__build' being added to 'scrollToLog',
+            // which is not what happens if you try scrolling to this last section
+            // (see above).
+            tabbar.getSection('config__build').activate();
+        }, 'widgets/config/freestyle-config-scrollspy.html');
+    });
+});
+
+function doSectionFunctionMocking(tabbar) {
+    function doMocks(section, viewportEntryOffset) {
+        section.getViewportEntryOffset = function() {
+            return viewportEntryOffset;
+        };
+    }
+
+    var mainOffset = 100;
+    var height = 40;
+    console.log('*** Mocking the position/offset of the form sections:');
+    for (var i = 0; i < tabbar.sections.length; i++) {
+        var section = tabbar.sections[i];
+        var offset = (mainOffset + (height * i));
+        console.log('\t' + section.id + ': ' + offset);
+        doMocks(section, offset);
+    }
+}
+
+function newManualScroller() {
+    var page = jsTest.requireSrcModule('util/page.js');
+    var scrollListeners = [];
+    var curScrollToTop = 0;
+
+    page.winScrollTop = function() {
+        return curScrollToTop;
+    };
+    page.onWinScroll = function(listener) {
+        scrollListeners.push(listener);
+    };
+    return {
+        scrollTo: function(position) {
+            curScrollToTop = position;
+            for (var i = 0; i < scrollListeners.length; i++) {
+                scrollListeners[i]();
+            }
+        }
+    };
+}
\ No newline at end of file
diff --git a/war/src/test/js/widgets/config/tabbar-spec.js b/war/src/test/js/widgets/config/tabbar-spec.js
new file mode 100644
index 0000000000..7a7810e45a
--- /dev/null
+++ b/war/src/test/js/widgets/config/tabbar-spec.js
@@ -0,0 +1,236 @@
+var jsTest = require("jenkins-js-test");
+
+require('./mocks');
+
+describe("tabbar-spec tests", function () {
+
+    it("- test section count", function (done) {
+        jsTest.onPage(function() {
+            var tabbars = jsTest.requireSrcModule('config-tabbar.js');
+            var firstTableMetadata = tabbars.tabs[0];
+
+            var jQD = require('jquery-detached');
+            var $ = jQD.getJQuery();
+
+            expect($('.section-header-row', firstTableMetadata.configTable).size()).toBe(4);
+            expect(firstTableMetadata.sectionCount()).toBe(4);
+            expect($('.tabBar .tab').size()).toBe(4);
+
+            expect(firstTableMetadata.sectionIds().toString())
+                .toBe('config_general,config__advanced_project_options,config__build_triggers,config__build');
+
+            done();
+        }, 'widgets/config/freestyle-config-tabbed.html');
+    });
+
+    it("- test section activation", function (done) {
+        jsTest.onPage(function() {
+            var tabbars = jsTest.requireSrcModule('config-tabbar.js');
+            var firstTableMetadata = tabbars.tabs[0];
+
+            // The first section ("General") should be active by default
+            expect(firstTableMetadata.activeSection().id).toBe('config_general');
+            expect(firstTableMetadata.activeSectionCount()).toBe(1);
+
+            firstTableMetadata.onShowSection(function() {
+                expect(this.id).toBe('config__build');
+
+                expect(firstTableMetadata.activeSectionCount()).toBe(1);
+                var activeSection = firstTableMetadata.activeSection();
+                expect(activeSection.id).toBe('config__build');
+                expect(activeSection.activeRowCount()).toBe(2);
+                expect(firstTableMetadata.getTopRows().filter('.active').size()).toBe(1); // should be activeSection.activeRowCount() - 1
+
+                done();
+            });
+
+            // Mimic the user clicking on one of the tabs. Should make that section active,
+            // with all of the rows in that section having an "active" class.
+            firstTableMetadata.activateSection('config__build');
+            // above 'firstTableMetadata.onShowSection' handler should get called now
+
+        }, 'widgets/config/freestyle-config-tabbed.html');
+    });
+
+    it("- test row-group modeling", function (done) {
+        jsTest.onPage(function() {
+            var configTabBar = jsTest.requireSrcModule('widgets/config/tabbar');
+            var firstTableMetadata = configTabBar.addTabsOnFirst();
+
+            var generalSection = firstTableMetadata.activeSection();
+            expect(generalSection.id).toBe('config_general');
+
+            var sectionRowGroups = generalSection.rowGroups;
+
+            expect(sectionRowGroups.length).toBe(1);
+            expect(sectionRowGroups[0].getRowCount(false)).toBe(0); // zero because it does not have any non row-group rows nested immediately inside i.e. does not have any "normal" rows
+            expect(sectionRowGroups[0].getRowCount(true)).toBe(4); // there are some nested down in the children. see below
+            expect(sectionRowGroups[0].rowGroups.length).toBe(1);
+            expect(sectionRowGroups[0].rowGroups[0].getRowCount(false)).toBe(4); // The inner grouping has rows
+            expect(sectionRowGroups[0].rowGroups[0].getRowCount()).toBe(4); // Same as above ... just making sure they're direct child rows and not nested below
+            expect(generalSection.getRowGroupLabels().toString()).toBe('Discard Old Builds');
+
+            done();
+        }, 'widgets/config/freestyle-config-tabbed.html');
+    });
+
+    it("- test finder - via handler triggering", function (done) {
+        jsTest.onPage(function() {
+            var configTabBarWidget = jsTest.requireSrcModule('widgets/config/tabbar');
+            var configTabBar = configTabBarWidget.addTabsOnFirst();
+            var jQD = require('jquery-detached');
+
+            var $ = jQD.getJQuery();
+
+            var tabBar = $('.tabBar');
+
+            // All tabs should be visible...
+            expect($('.tab', tabBar).size()).toBe(4);
+            expect($('.tab.hidden', tabBar).size()).toBe(0);
+
+            var finder = configTabBar.findInput;
+            expect(finder.size()).toBe(1);
+
+            // Find sections that have the text "trigger" in them...
+            keydowns('trigger', finder);
+
+            // Need to wait for the change to happen ... there's a 300ms delay.
+            // We could just call configTabBar.showSections(), but ...
+            setTimeout(function() {
+                expect($('.tab.hidden', tabBar).size()).toBe(3);
+                expect(textCleanup($('.tab.hidden', tabBar).text())).toBe('General|#Advanced Project Options|#Build');
+
+                var activeSection = configTabBar.activeSection();
+                expect(textCleanup(activeSection.title)).toBe('#Build Triggers');
+
+                expect($('.highlight-split .highlight').text()).toBe('Trigger');
+
+                done();
+            }, 600);
+        }, 'widgets/config/freestyle-config-tabbed.html');
+    });
+
+    it("- test finder - via showSections()", function (done) {
+        jsTest.onPage(function() {
+            var configTabBarWidget = jsTest.requireSrcModule('widgets/config/tabbar');
+            var configTabBar = configTabBarWidget.addTabsOnFirst();
+            var jQD = require('jquery-detached');
+
+            var $ = jQD.getJQuery();
+
+            var tabBar = $('.tabBar');
+
+            configTabBar.showSections('quiet period');
+            expect($('.tab.hidden', tabBar).size()).toBe(3);
+            expect(textCleanup($('.tab.hidden', tabBar).text())).toBe('General|#Build Triggers|#Build');
+
+            var activeSection = configTabBar.activeSection();
+            expect(textCleanup(activeSection.title)).toBe('#Advanced Project Options');
+
+            done();
+        }, 'widgets/config/freestyle-config-tabbed.html');
+    });
+
+    it("- test finder - via showSections() - in inner row-group", function (done) {
+        jsTest.onPage(function() {
+            var configTabBarWidget = jsTest.requireSrcModule('widgets/config/tabbar');
+            var configTabBar = configTabBarWidget.addTabsOnFirst();
+            var jQD = require('jquery-detached');
+
+            var $ = jQD.getJQuery();
+
+            var tabBar = $('.tabBar');
+
+            configTabBar.showSections('Strategy');
+            expect($('.tab.hidden', tabBar).size()).toBe(3);
+            expect(textCleanup($('.tab.hidden', tabBar).text())).toBe('#Advanced Project Options|#Build Triggers|#Build');
+
+            var activeSection = configTabBar.activeSection();
+            expect(textCleanup(activeSection.title)).toBe('General');
+
+            done();
+        }, 'widgets/config/freestyle-config-tabbed.html');
+    });
+
+    it("- test adopt sections ", function (done) {
+        jsTest.onPage(function() {
+            var configTabBarWidget = jsTest.requireSrcModule('widgets/config/tabbar');
+            var configTabBar = configTabBarWidget.addTabsOnFirst();
+            var jQD = require('jquery-detached');
+
+            var $ = jQD.getJQuery();
+
+            var tabBar = $('.tabBar');
+
+            // Move the advanced stuff into the general section
+            var general = configTabBar.getSection('config_general');
+            general.adoptSection('config__advanced_project_options');
+
+            // Only 3 tabs should be visible
+            // (used to be 4 before the merge/adopt)...
+            expect($('.tab', tabBar).size()).toBe(3);
+            expect(textCleanup($('.tab', tabBar).text())).toBe('General|#Build Triggers|#Build');
+
+            // And if we try to use the finder now to find something
+            // that was in the advanced section, it should now appear in the
+            // General section ...
+            configTabBar.showSections('quiet period');
+            expect($('.tab.hidden', tabBar).size()).toBe(2);
+            expect(textCleanup($('.tab.hidden', tabBar).text())).toBe('#Build Triggers|#Build');
+
+            var activeSection = configTabBar.activeSection();
+            expect(textCleanup(activeSection.title)).toBe('General');
+
+            done();
+        }, 'widgets/config/freestyle-config-tabbed.html');
+    });
+
+    it("- test getSibling ", function (done) {
+        jsTest.onPage(function() {
+            var configTabBarWidget = jsTest.requireSrcModule('widgets/config/tabbar');
+            var configTabBar = configTabBarWidget.addTabsOnFirst();
+
+            // console.log('**** ' + configTabBar.sectionIds());
+            // config_general,config__advanced_project_options,config__build_triggers,config__build
+
+            var config_general = configTabBar.getSection('config_general');
+            var config__advanced_project_options = configTabBar.getSection('config__advanced_project_options');
+            var config__build_triggers = configTabBar.getSection('config__build_triggers');
+            var config__build = configTabBar.getSection('config__build');
+
+            expect(config_general.getSibling(-1)).toBeUndefined();
+            expect(config_general.getSibling(0)).toBe(config_general);
+            expect(config_general.getSibling(+1)).toBe(config__advanced_project_options);
+            expect(config_general.getSibling(+2)).toBe(config__build_triggers);
+            expect(config_general.getSibling(+3)).toBe(config__build);
+            expect(config_general.getSibling(+4)).toBeUndefined();
+
+            expect(config__advanced_project_options.getSibling(-2)).toBeUndefined();
+            expect(config__advanced_project_options.getSibling(-1)).toBe(config_general);
+            expect(config__advanced_project_options.getSibling(0)).toBe(config__advanced_project_options);
+            expect(config__advanced_project_options.getSibling(+1)).toBe(config__build_triggers);
+            expect(config__advanced_project_options.getSibling(+2)).toBe(config__build);
+            expect(config__advanced_project_options.getSibling(+3)).toBeUndefined();
+
+            done();
+        }, 'widgets/config/freestyle-config-tabbed.html');
+    });
+
+    function keydowns(text, onInput) {
+        var jQD = require('jquery-detached');
+        var $ = jQD.getJQuery();
+
+        // hmmm, for some reason, the key events do not result in the text being
+        // set in the input, so setting it manually.
+        onInput.val(text);
+
+        // Now fire a keydown event to trigger the handler
+        var e = $.Event("keydown");
+        e.which = 116;
+        onInput.trigger(e);
+    }
+
+    function textCleanup(text) {
+        return text.trim().replace(/(\r\n|\n|\r)/gm, "").replace(/  +/g, "|");
+    }
+});
\ No newline at end of file